Lots of small changes to content to fix reported bugs