various enhancements & minor bugfixes