Cleanup and Misc improvements