Hi there
Had a visit to the recently refurbished National Museum of Scotland in Edinburgh, a litle while ago. They have excellent collections and now have more ethnographic material on display. Here are a few images I took, which I am posting with the Museum's permission.
As well as ethnographic arms and armour, they have displays of historic Scottish weapons. The displays of prehistoric material on the lower ground floor are also particularly fine. Their website is
www.nms.ac.uk
Free admission and in my opinion thoroughly recommended !