made some stuff better