fixed and hooked up stuff