re usecase matrix fixes....