Fixed a couple of sub commands that would misfire - fixing OutOfBounds exception.