some fix and remove comments