updating provider b/c wtf
fixing a few bugs
Merge branch 'dev'