Changed some equations and print outs around.