Some cosmetics and other little stuffs.

add, test, pull request! = )