revised 'usage' string to align with feature

also fix a minor bug in handling command line switch.