Ok, a few more tweaks.