fixing up some loose ends