fixes/logging