minor debug improvments, mostly comments