some small improvements.