minor fixes
cleanups