Content Block XML is now better. Closes #50.