small changes, removed more debugging code