Fixed some thingies..