whoops...

Few things didn't make it in to 2.0