BugFixes and prepare for release