added/removed some comments