Fix topic name and add some comments