separate canonical and normal terms
merge master
added metas to syntax