add & support in macro… fix some bugs