Bugfix and Enhancements