update vo-param from Carlo's developements and fix merge