1.0.0 updates

Assorted fixes and enhancements. Comments, @kainosnoema?
We're mapping the presentation, so I'm pretty sure we need it?