Er, this
Removed some debug messages, improved others