Tested some more, removed some debugging statements.