fixed up some loose ends