fixed up stuff