Many BugFixes