improve some stuff