Drive and Arm Fixes

Squashed some bugs.
Moar Drive and Arm Fixes

See previous commit.