Logging update & more escapes