Fix stuff
Update makefile