some minor improvements and  bugfixes