Modified debug lines, added a few