Fixed a few parsing bugs
Merge branch 'manipulation' into trajectory