Minor - tag cleanup, correct caps, misc others