minor delint, improve debug logging