caught edge case where thousands without hundreds, eg 1001, were being converted without an 'and'
Merge branch 'one_million'