minor improvements
minor fixes