Tightened a few loose ends