updates to comments and changes after more tests.