All numbers below are from the latest 10-Q except where noted.
Shares Out 874 (recent number, quarter end was 857) Options 305 (245 subject to 61 day notice, a few not vested) Warrants 312 ( some exercised early July, 59m suspended)
So if you ignore the games about notice and suspension, you are correct that it is close to 1.5 billion fully diluted.