BugFixes and stuff