Fixed up Rift support along with head tracking code