correct import of macros, fixed minor problem with rules