Bugfixes: Now working Version