Tag cleanup

This PR is meant to come AFTER #48 is merged. It's basically a cleanup of all the tags.