Some BugFixxes
...