Updating deps
Some code tidy up, untested at present due to local issues with curl