I've got one remark. Isn't it mount Everest, mount Mont Blanc, mount McKinleny, but Himalaya mountains, etc. I've always used the word "mountain" for the whole chain, not for its highest point.
(2) I agree with the stadium/arena thing. Madison Square Garden isn't a stadium. I tried "sports facilities"--that (and other similar things) should work.
(3) I also agree with accepting "department stores" for Target, Walmart, and Macy's. That was the first thing I thought of too.
(4) BP, Texaco, and Shell are also gas stations, in addition to being oil companies, so that should work.