Main change was a bug in the drag calculation -- the direction of drag was incorrect.