port some more docs over from 2.0