Oops a few more tweaks I can't help myself