Build now works, Bugfixes of some other reaseons