removed some debugging code, clarified some of the remainder
removed some debugging code