Various Fixes and Updates