Fix a bug or two.  Working.