2013-02-03: improvements of the classification chapter