Vincent + misc corrections