Core pr 5

Fixed some user redirects and coding style.
I would much prefer that install and update functions called a shared function. That makes it much more readable.