Comment and fix different things
Merge branch 'new-provider' into new-cursor