Style and content fixes