test and improve some bug