improve some exercises