Delete comment & some fixes