various enhancements and bugfix