BugFix and more...