code cleanup, new configs, results