Yet more tweaks...

Yea... more...