add topics, fix naming bug