And fixed some last thingies