made DBG calls one-liners where applicable