Makefile cleanup & docs update