Updated Dependencies and some tweaks