More work on documentation and thinking