Various Bugs
Cleanup