Further debugging of motion model.  Changing all items to work of of data index, instead of vector occurrence index.