I totally agree! I definitely think that they could have cut short all the emo and then dealt with 4.17's topic in at least another episode and then everything would have made more sense! not to mention that it would have given us a lot more of Sam on screen!