Added notion of expected runtime
Makefile fix