Update commands to include sysvars.  Clean up logging.