remove non-capturing in regexps, not needed now
cleanup/refactor terms
cleanup terms more, start categorizing
update build