Added nicer Logging
Fixed merge conflicts