minor fixes and cleaning