fixed all comments