Fixin'

1. Adds type to database state documents
2. Cleans up schema
3. Fixes environment.config YAML