Incorporated Bugfixes from wiki