Core pr 5

Fixed some user redirects and coding style.
@cableman I know it is a big change and I understand you are reluctant to changing this but I hope you agree that provider is a poor role name.