fixed couple of minor thingies?