Fixed logging
Fixed logging
Small improvements