Minor tweaks.  Sleep-deprived throwing around of ideas in comments.