introduce EFFECT_* macros
small fixes