Use improved documentation aids and fix typos