Big cleanup and network description fixes.