Added Total, Fixed output formatting
Added toString, Fixed preTax formula