Tagging System & Other Updates