Wrapped up some loose ends