Fixed a couple thingies