date, duplication, cleaning and namning fix