Updating the rift demo to be more usable.