Updates to project
Updates to makefile