bug fixes and provider