fixed all the lap thingies