a number of small improvements