Lots of little fixes as we push for release.