Make stabilization easier, correct some errors on thirst system