Added Saturation and Exhaustion

...and some fixes