fix final thingies