Added total total row and fixed some stuff