fix wiring Riddles

fix wiring Riddles and more.