Update comments
Update dependencies. Fix tests.