keeping up with things!
add back the anti-focus thing (?!)
minor tweaks