working on bugs and updates to tags