Fixed get_topic and minor changes