Makefile cleanups, make clear measured times are in ms