Tags: Added new tags

Also fixed some references