Additions to previous commit, also remove UnitDynamicFlags.Tapped (0x4)