re usecase matrix fixes.....