minor fixes
minor improvements