One last runByTime2 -> runForTime
Makefile fixes