updated and cleaned some comments