Merge multi-db branch, minor touchups, and examples