NOTE AND WARRANT AMENDMENT AGREEMENT