I've played again after a while and it seems like my old files are kinda messed up, the progression and all, and that's fine, since I don't mind reading things again, the start got reworked too and all so that's nice.
I'm making this post because there is this path I took a while ago where both Rajeeyah and Samuel go to the baths with you, but... now when I do the Samuel route, it triggers the new events where you go to another place with Samuel instead, so... is there a condition I'm missing for this to happen?