update deps, minor code edits