FIPS 10-4 additions and corrections