added, removed some comments