some minor improvements
bugfixes