Comment and API updates