Updated docs, build, makefile and upgrade