Enhancements and Bugfixes