upgrade deps and refactor internals (naming still needs work)