Additional residual statistics
refactor