minor improvements
merged with master