cleaning up a little, fixing some comments, removing some debugging