Fixed Makefile, made some progress on timings.