would you care to help me figure out the terms of the typenex warrant? does the 557,500 amount include both the note and the warrant, or is each separate resulting in a total of 1,115,000?