AMENDMENT NO. 2 TO CONVERTIBLE PROMISSORY NOTE AND AMENDMENT TO WARRANTS