added more macros, fixed unbound invoking calls