Added usage display and minor changes.