BugFixes and new Features