tidying up some loose ends