fix a few thingies