further debugging tweaks