some cleanups in configuration and documentation