Improved logging
Fixed source url.
Improved logging
Formatting