Tidying up tags

Closes #1 and #2