Updated dependencies
Updates and fixes to several files