minor fixes
cleanup