Covered all (I think) of @Gozala's comments, moving on to more tweaks