Cleanup

-Rearranged initialization/enabling/disabling to better support
different HMDs
-Fixed a few issues