Core pr 5

Fixed some user redirects and coding style.
A comment explaining this would be good.