adding tag working, bug fixes