v3.0 update

Will send this to master and create a new branch "v3.0" after.