Rename 6.6 to 7.0 plus a few extra changes