Updated docs and makefile