Improvements to tagging system, and some setup for similarity matching.