Cleanups, condensing, and parameter tweaking.