Lot of small changes, and attempts to fix tag issue.
Spent more time pursuing tangents instead of actually trying to fix the problem, yay for distractions!