Fixed all new issues except the 'total does not equal charges' which I'm awaiting your explanation of.