Bug fix, cleanup

Moving toward the first release.