Makefile and README imrovements