Comment and composer updates