Merge pull request #360 from pgreyson/master

Map-based topology view and assorted