WAIVER AND MODIFICATION AGREEMENT