Updated topology and start and stop scripts