add block macros and fixed others