More rift stuff working and game controller support