Code cleanup and bug fixes.  Fixes for command arg name change from
previous commits