update deps. Closes #2227. Closes #2228