Adds back motion_kit_id, and some other misc fixes and such.

Nothing glorious or epic here.