tighten up definition of money
Merge branch 'float_money'