Movement Improvements
Merge branch 'steven' into development
Minor Changes
Call Type Fixes
Merge branch 'steven' into development
Minor Movement Changes
Merge branch 'steven' into development

* steven:
  Minor Movement Changes