more configs, more fixes