CodeBook and README TODOs, renamed measurement