some bug fixed and clean files