-fix reservoirs determination; fix invade(), Pw can be negative (mode1)