re #33 - Final content fixes