more debugging tweaks