Actual topology names, general code improvements. Better lookin'.
Sorted.