Added/removed a few comments