improve some behaviors