Finetune Wheatley and Row elevator fixes commit is next