Minor tidying and docs.