Updated movement structure.
Misc work.