improve logging & debugging