Various Fixes/Features