added a few small improvements