MODIFICATION AND WAIVER AGREEMENT