Add a few new dependencies and smaller changes