Shell - fix ! operator executing commands with arguments
Shell - bug fixes to template rendering