Updated Makefile, fixed some errata