Update dependencies + minor polishing