Synced some stuff and no longer using v2
Updating comments and some other stuff.