Widespread updates

Ongoing development.