#169 fixes in code, some pruning. the macros number reduced