WAIVER AND AMENDMENT AGREEMENT