Modified a few comments that were not accurate anymore