Updated projects and Makefile