Fix minor bugs and change data.