fixing makefile to be less eager, and updating checkpoint with minor fixes