Updates dependencies and makes more optional
Fixes major bug introduced by dumb typo on refactoring