Pull request: #84 millions/thousands as source units

- sql changes
- logical changes