Updated dependencies, various bugfixes