Fixed a typo, re-ordered a few things.