wrapping up some loose ends