Added Makefile
Timing tweaks.