Couple more tweaks
etc