Corrected small bugs and change some parameters name.