xiao chen fix many bugs