Tied some loose ends