fixes and topic stuff