Tweaked, updated, and cleaned up a bit.

If you see that I messed up somewhere or don't like something about it, just let me know.