Some changes for logging
Merged something, dont know why xD