added topology + other tweaks and bugfixes