Misc bugfixes, disabled some of the more obnoxious debug output