many bugs fixs