Another BugFix and some changes