Of course they were still mapping, you saw the one stuck in that corridor that lead to the hangar.
He did not retrieve all his PUPs, but why wouldn't he retrieve his PUPs? They belong to Ffield, they're Fifield's PUPs. Why would he leave his PUPs behind? That doesn't make any sense.
I'm not making excuses, since nobody here is the screenwriter, and call tell us definitively the intentions behind the scene. It's not just in the script, but all the discussions they had behind the scenes. None of you are experts on the film, since nobody here was involved in making the film, thus your judgments about the film are not truth, therefore it is impossible for anybody to make excuses, as excuses to what? Your nitpicks? Because that's all they are - nitpicks.