dummy substances support
substance parsing improvements
renaming
refactoring