Updated Makefile (still working on dependencies, which are broken)