Various Fixes and Enhancments