Updates a bunch dependencies and minor cleanup