logging + fix