Some topics improvments