Improving some things.

P.S: 4e1ab4e7f05d81fd636e126f0900ae74b0f4a189 is only to show things that are forgotten in translation (even i didn't seen).