restructured config file a bit, and other changes that go with it