Thanks! Now I come to think of it, the second room you mentioned is particularly confusing to newcomers...
I've attached both room's intended routes if you or someone else got stuck there! (Arrows are dashes)