fixing all water/picker issues