fix up some stuff