v7.0 final

Many changes from 7.0 beta