Improved 822 docs