update

some bug are corrected