makefile updates and doc tweaks