Removed lots of unused locations, elaborated a couple of descriptions