cleaning up code and output, updating some dependencies