Movement Improvements
Merge branch 'steven' into development
Minor Changes
Call Type Fixes
Merge branch 'steven' into development
code cleanup and better commenting