more minor fixes
minor changes