minor changes in implementation thingies