more velocity and accel composition fixes. other edits. TODO: clean up