Fix onCompletion bug, add second Makefile.