various content fixes