Some tidying and additional caveat documentation.