small changes. not so important.
GenerateMatrix overworked. not much better yet and just a test-style-code.