Partial commit for a few comments