fix arguments and add debug - tagging is *very* slow