Nick's comments
Update dependencies