fix some things up. guess that Provider:.getInstance method is cooler than a global helper