Minor changes.
Bleh, this'll take awhile.