make research, fix other bugs, reorder