Ported to new OM style.
Fixed typos.