Best settings so far, and a bit of code cleanup/fixes.