cleanup
minor fixes