implement small improvements