Adds new topology, fixes some bugs :)