fixing up stuff