Some configurator stuff and other minor changes