change many bugs