Updated makefiles to proparly make the project, and fixed synta errors