Yes, the 1,400,000 is included in the 3,500,000 total (1.4 + .7 +.7 +.7 = 3.5). Those warrants never had a price trigger as they were immediately exercisable, apparently (per the 10K language).
I don't have much knowledge or memory regarding these, just going by what I'm reading in the 10K.