Tags: Added new tags

Also fixed two small things found by scripts