1.0.0 updates

Assorted fixes and enhancements. Comments, @kainosnoema?
Hmm... ya, that seems to work. Any reason why you didn't remove the setting of `resource` here? It's kinda confusing. :/