Second Commit.  Many Fixes