BugFixes

Bugs Ficed