Spoken move cleanups and bug fixes