Code Cleaning

Cleaned up the code a bit more
Added TODOs in Measure and RawMeasure for things that could be worked on
tomorrow while I'm gone. Good Luck Alice.  I hope I didn't leave
anything too broken :P.