ess-measurement still wip, sds completed, general cleanup