Minor bug, styling and wording fixes