Improved Makefile and docs