Better support for custom descriptions, doc fixes