...and options do cause dilution just like warrants when they are exercised.
Options have an expiry date and may not be exercised. My understanding is that they aren't converted to shares until they are exercised. Though sometimes expired options can be reissued as well.