Tagging and tracking along with other fixes