Updated the Makefile. Edited misc code.