minor enhancements and bugfixes