More conclusions; some fixes / extensions everywhere.