make some small improvements