getting to final stages.  A few bugs left...
finishing measure enhancements