Changed speech free map to quoted.
Changed catalogs to conform to new syntax.