cleanups and config fixes