Roll up before adding new term types
Refactored optional terminal handling
Misc refactoring
Updated tests
Updated README