Hehe, you're correct on all counts.
Well, since I'm not Stephen Colbert, that was not a foregone conclusion (seriously, that guy knows a creepy amount of Middle Earth lore). Still, gave me an excuse to break out my old copy of The Silmarillion and kill half an hour or so. Much better than doing actual work ^_^
Middle-Earth didn't used to be screwed up until Peter Jackson came along and fucked it all up!
;_; I thought it was reverently accurate, for a novel -> movie translation.