update dependancies, few tweaks