Fourth commit.  Small fixes.