Added/updated comments