Added NAME_TAG and fixed -v option.