added and removed some comments