Tied up some loose ends