added some comments, removed some comments