Fixed errors in a few files.  Beginning testing.