clean up
minor fixes