cleared up some stuff