The graveyard is a major annoyance. The sort of thing that makes me hesitate to revisit the game. I go back and replay it every few years. But that damn graveyard definitely comes to mind every time I weigh the option. And yeah, I hate that water wheel puzzle as well.