Random tweaks.
Makin' progress...