updates and new types
Merge branch 'initial-config'