improve some things