sweep2wake: add log printing and further cleanups