Typo
Fixed bugs in --component option
Fix hard-coded storage translation.