rift: position tracking, logic fixes