Misc work, mainly on measures

Tempted to merge in and finish new measures stuff now, but should wait