Code Cleanup

Increase robustness of currency checks
More appropriate numerical formatting
Comments/cleanup/etc.