Improve some stuff