NOTE AMENDMENT AND WAIVER AGREEMENT