better comment parsing