Added some missing features to 2.7.0. 

Note that this supercedes the previous increment commit.