simplified some code, better hidden tag mgmt, etc.