Makefile and README updates, config bug fix