Small Additions and Bugfixes