Fixes, Cleanup and Comments added