Comment and chip detection updates