Bugfixes and Additions