Content fixes, no major things
Merge pull request #237 from pawal/master

Content fixes, no major things