More work on documentation. It's getting messy...