Update makefile and build