initial debugging tweaks