Code touchups that remove warnings.  Closes #7