fixed all DS number matching

Found lots of mismatching DS number to the actual value. Vetted through all of them one by one and fixed the numbers in the template.