Updated some versions
Fixed one todo