fix many viva updates from month of June - July 15