README and generator improvements