hcat code fix Riddles

hcat code fix Riddles and more.