Water gathering issues

1) It takes way too long to gather a bucket of water
2) After you loot a bucket of water from the window, your character goes through the animation of gathering the water a second time
3) Sometimes when gathering water, when you click on the well, your character walks 10 feet away and then gathers the water from the ground instead of the well.

Of these, #2 is probably the biggest problem, followed by #1, then #3.