BugFixes and minor Improvement