general cleanup, added selection of topic by number