Uh, oops.

I overlooked a few things. Also expanded a few things as well.