Fixed some warnings
Fixed Makefile. Onto making Nico's first test pass