Removed some redundancy from tags and improved tag behaviour.