change topic order and fix some other problems