Fixed much of movechooser

Works more logically, no more null.