A little more work on matrix library