minor improvements
bugfix