Added and fixed a couple of things.

Looks like I'm the one who are doing the final touch now :P