Edit Makefile and lab