Updated dependencies and some small refactors in the code
merged, solved conflict, and some bugs