Added better rollup of WARN, WAIVED, etc. Fixed waiver setting.