minor improvements
minor