Fixing closure deferment and updating makefile