fix some plurals and add Double -> Float type mapping