Further cleanups, added server configuration generation.