some bug fix and deal modification