Update makefile, minor fixes