turn macro with 'parameters' to a function, some more keywords, bit improved gramma