Final (hopefully) touches for sec. 2.