lotsa thingz
fixed merge