WAMP Fixes

removed money_format and fixed a few other WAMP issues