more adjustments to money
Merge remote-tracking branch 'upstream/master'