use scale option
fixed merge conflict
code cleanup, output more useful