Core pr 5

Fixed issues with online URL's.
Mostly coding style fixes and minor bugs.