rest of logging-related changes