fixed bugs, + configurable thirst