Fixing Makefile, updating docs