debugging tweaks