adding lots more configuration options, fixing keyword and bad overrides in gen'd code, other stuff