support import and export notation for templating
cleanup grammar