Get rid of lots of junk debug output, and fix up coding practices.
Please, for everyone's sanity conform to our hacking guidelines.

I don't like playing janitor.