Clean up, Small Fixes, and Making Code More Robust