Quick edits to get everything to the "I'm working on it" stage.

Probably won't get to mess around with it for awhile, but I figured I'd
get it up and running because I had a few minutes and was bored...