A couple of format and content tweaks