minor fixes
cleaning up