bumped dependencies, minor refactoring