updates
Made a few small improvements