...removed more debugging code
fixed non-tab spacing