Various Improvements/Cleanup (Again)