Different minor changes. Test for MatrixGenerator. more a run-app :P big problem with low-populations to fill. I'll fix it soon.