Fixed some thingies