Some improvements to update, but still lose keyboard control.