1.0.0 dev

pulling in a bunch of fixes