2.1.17

Only small improvements.