Word definition added in CMS
Some partial short code stuff, field modifications