Minor tweaks to debug output, commiting so i can sync