minor debug improvings