a few small improvements