changed some comments, and added more debug features