cleared up some issues