Updated docs and improved granularity of tag tracking