fixing some rm's and cp's