some Bugfixes, some new Bugs