modify comment & fix bug