Last Bugfixes for a working prod version