Switched the norm used in computing the residual error
Added residual scaling to make everything unit norm(ish)