Rev'd dependencies + other minor changes