Now, it be pimpin.

Some improvements.