fix performance for 4 by 4, add Qu handling