some small improvements