Fix 595-132, add 's' to end of units where appropriate