Using fullname for location of building and abbreviation in brackets. Make location more clear. Addresses issue #1