Added some vars for rift support
Merge conflicts
Removed the dev support and changed some unsigned vars