OVRv2 stuff, tons of fixes, still needs polish