some more fixing up