Added some topology stuff and fixed hosts