You might be right about Athena. Having only watched the entire series once, and never seen any episode more than once, it's kind of hard for me to think back and remember super specific scenes. Especially when there's like a gazillion different Athenas/Boomers/Sharons/3s, etc. ... She was a three right?

Speaking of Sam, I would just like to say that i think he got completely shafted during the series finale. He was such a good guy and what did he end up with? A woman who never really loved him, and left in a weird catatonic state that left him to clean up everyone's mess while they all got to enjoy the new Earth.