More docblock fixes and provider tweaks