The warrants/ options figure of 46,062,336 from the 10q I posted at 3:24 today is just that, warrants and options.
The post Ease made at 2:02 today describes the warrant number being 29,921,015. This number I believe is correct as:
46,062,336
-29,921,015
__________
16,141,321 bal. These are all stock options
The warrants are gradually disappearing.