change '@:macro' to 'macro'
array comprehension
mmml file definition update