Incorporated review suggestions
 - new, seperate dictionary for topology information
 - layout