Some small improvements of 2.1.1