minor adjust and new macros
minor xchecks in effunf