2014_01_06_12_51: some small improvements.