minor bugfixes & enhancements