Fixed off by one error in VariableCommand class.
Mostly book keeping / organization.  Moved a lot of stuff in command
classes to separate methods.