added water to dungeon, added waterskin (drink, fill), small other changes