Measure improvements

Features are complete, disappearing arguments are a problem on develop and not specific to this branch #1177