There's way too many errors in logic in this quest such as push blocks and kill the leader.
For kill the leader I'd either take it completely out, or have it work every time
For push blocks, make them all four way, there's nothing in the way of those blocks, even if there is (Like a door, not object), the player needs to think before he acts.
That's what LoZ is all about.