Add some MACRO
Fix some mistakes