Updates to the stopwatch, added a test makefile.