tweaks to focus behaviour, the right fields should autofocus at the right times now