made some stuff nullable