Fixing a few things, added numerical ordering of listing commands.