changed makefile arrangement to simplify configuration, working on docs