Hacked over some bugs in the merge from the main branch.

Updated dependencies.