minor improvements
minor changes