A ton more tweaking and polishing