Settings / tag wording consistency updates
Refactored tagging
Mod class cleanup