Better fix for previous bug and include diagonals in error est. (NEWAMB)