Tags: Added new tags

Also fixed a few references