Transition Fixes

For moving during dialogue.
Merge with Arch XML