More minor touchups.
 -Erik
5 files changed