Removing debug stuff, tweaking comments.