new implementation of macro with quasiquotes - also some improvements in the base lib