Further work on documentation (unfinished)