few small improvements