Yeah. I only remember the underwater area, the only thing I didn't include in the game was a lever that would turn the lights in the room on. (would be placed on the far right of the room next to the entrance)