Typo fixes and new content for backporting to trusty