minor fixes
minor fixes
minor fixes
minor fixes
minor fixes and cleanup