made a few small improvements