And a few more tweaks...