Various Fixes and Improvements