logging, fixes