Bugfixes + new Bugs found