AMENDMENT AND WAIVER AGREEMENT