cleared up stuff