Add singleton & scale for empty scales.
Closes #127