improved guard shell behavior
improved command behavior