refactor sentence types & unify parsing for proprietary types. fixes #6, fixes #8