Slight tweaks to documentation and architecture.