1 0 0 updates

Assorted fixes and enhancements. Comments, @kainosnoema?