add a comment about re-submit of main macro and const fix