Various Fixes and Additions