Dependancy update and a few tweaks