Documentation enhancements

This is related to #784