bugs fixed at macro data
starting to change ast parser