More clean up, update readme