This merge contains a usage description fix to the main topology generator script as well as semantic bugfixes to the random topology generator.