Many Bugfixes, now it works