Mainly doxygen, minor changes to measures