updates for ddollars.js from master