More 2.0 keywords.

Missed a bunch of functions first time round. Should be fairly complete now.