Improved documentation (more)