NJ millionaires to pay more in taxes under deal