diff --git a/Pig.JSON-tmLanguage b/Pig.JSON-tmLanguage
index 422e524..e674467 100644
--- a/Pig.JSON-tmLanguage
+++ b/Pig.JSON-tmLanguage
@@ -23,7 +23,7 @@
             "name": "storage.datatypes.pig"
         },
         {
-            "match": "\\b(PigStorage|BinStorage|BinaryStorage|PigDump|HBaseStorage|JsonLoader|JsonStorage|AvroStorage|TextLoader|PigStreaming|TrevniStorage|AccumuloStorage)\\b",
+            "match": "\\b(PigStorage|BinStorage|BinaryStorage|PigDump|HBaseStorage|JsonLoader|JsonStorage|AvroStorage|TextLoader|PigStreaming|TrevniStorage|AccumuloStorage|OrcStorage)\\b",
             "name": "support.function.storage.pig"
         },
         {
@@ -35,11 +35,11 @@
             "name": "support.function.udf.math.pig"
         },
         {
-            "match": "\\b(CONCAT|INDEXOF|LAST_INDEX_OF|LCFIRST|LOWER|REGEX_EXTRACT|REGEX_EXTRACT_ALL|REPLACE|SIZE|STRSPLIT|SUBSTRING|TOKENIZE|TRIM|UCFIRST|UPPER|LTRIM|RTRIM|ENDSWITH|STARTSWITH|TRIM)\\b",
+            "match": "\\b(CONCAT|INDEXOF|LAST_INDEX_OF|LCFIRST|LOWER|REGEX_EXTRACT|REGEX_EXTRACT_ALL|REPLACE|SIZE|STRSPLIT|SUBSTRING|TOKENIZE|TRIM|UCFIRST|UPPER|LTRIM|RTRIM|ENDSWITH|STARTSWITH|TRIM|EqualsIgnoreCase|SPRINTF|STRSPLITTOBAG|UniqueID)\\b",
             "name": "support.function.udf.string.pig"
         },
         {
-            "match": "\\b(AddDuration|CurrentTime|DaysBetween|GetDay|GetHour|GetMilliSecond|GetMinute|GetMonth|GetSecond|GetWeek|GetWeekYear|GetYear|HoursBetween|MilliSecondsBetween|MinutesBetween|MonthsBetween|SecondsBetween|SubtractDuration|ToDate|WeeksBetween|YearsBetween|ToMilliSeconds|ToString|ToUnixTime)\\b",
+            "match": "\\b(AddDuration|CurrentTime|DaysBetween|GetDay|GetHour|GetMilliSecond|GetMinute|GetMonth|GetSecond|GetWeek|GetWeekYear|GetYear|HoursBetween|MilliSecondsBetween|MinutesBetween|MonthsBetween|SecondsBetween|SubtractDuration|ToDate|ToMilliseconds|WeeksBetween|YearsBetween|ToMilliSeconds|ToString|ToUnixTime)\\b",
             "name" : "support.function.udf.datetime.pig"
         },
         {
@@ -118,6 +118,14 @@
             },
             "begin": "(?i)\\s*(DEFINE|DECLARE|REGISTER)\\s+(\\S+)",
             "end":";?$"
+        },
+        {
+            "begin": "(?i)^\\s*(fs|sh|clear|exec|help|history|kill|quit|run)\\s+(.*)",
+            "end": "$",
+            "beginCaptures": {
+                "1" : { "name" : "keyword.parameter.pig"},
+                "2" : { "name" : "string.other.pig"}
+            }
         }
     ],
     "scopeName": "source.pig",
diff --git a/Pig.sublime-completions b/Pig.sublime-completions
index 8850f65..e48545b 100644
--- a/Pig.sublime-completions
+++ b/Pig.sublime-completions
@@ -56,12 +56,15 @@
                 { "trigger" : "REGEX_EXTRACT_ALL ", "contents" : "REGEX_EXTRACT_ALL(${1:string}, '${2:expression}')" },
                 { "trigger" : "REPLACE", "contents" : "REPLACE(${1:string}, '${2:oldChar}', '${3:newChar}')" },
                 { "trigger" : "RTRIM", "contents" : "RTRIM(${1:string})" },
+                { "trigger" : "SPRINTF", "contents" : "SPRINTF(${1:format}, ${2:value})" },
                 { "trigger" : "STARTSWITH", "contents" : "STARTSWITH(${1:string}, ${2:testAgainst})" },
                 { "trigger" : "STRSPLIT", "contents" : "STRSPLIT(${1:string}, '${2:expression}', ${3:limit})" },
+                { "trigger" : "STRSPLITTOBAG", "contents" : "STRSPLITTOBAG(${1:string}, '${2:regex}', ${3:limit})" },
                 { "trigger" : "SUBSTRING", "contents" : "SUBSTRING(${1:string}, ${2:startIndex}, ${3:stopIndex})" },
                 { "trigger" : "TRIM", "contents" : "TRIM(${1:string})" },
                 { "trigger" : "UCFIRST", "contents" : "UCFIRST(${1:string})" },
                 { "trigger" : "UPPER", "contents" : "UPPER(${1:string})" },
+                { "trigger" : "UniqueID", "contents" : "UniqueID()" },
 
                 { "trigger" : "TOBAG", "contents" : "TOBAG(${1:expr})" },
                 { "trigger" : "TOP", "contents" : "TOP(${1:topN}, ${2:column}, ${3:relation)" },
diff --git a/Pig.tmLanguage b/Pig.tmLanguage
index 8618e8f..7e3ed8a 100755
--- a/Pig.tmLanguage
+++ b/Pig.tmLanguage
@@ -39,7 +39,7 @@
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>\b(PigStorage|BinStorage|BinaryStorage|PigDump|HBaseStorage|JsonLoader|JsonStorage|AvroStorage|TextLoader|PigStreaming|TrevniStorage|AccumuloStorage)\b</string>
+			<string>\b(PigStorage|BinStorage|BinaryStorage|PigDump|HBaseStorage|JsonLoader|JsonStorage|AvroStorage|TextLoader|PigStreaming|TrevniStorage|AccumuloStorage|OrcStorage)\b</string>
 			<key>name</key>
 			<string>support.function.storage.pig</string>
 		</dict>
@@ -57,13 +57,13 @@
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>\b(CONCAT|INDEXOF|LAST_INDEX_OF|LCFIRST|LOWER|REGEX_EXTRACT|REGEX_EXTRACT_ALL|REPLACE|SIZE|STRSPLIT|SUBSTRING|TOKENIZE|TRIM|UCFIRST|UPPER|LTRIM|RTRIM|ENDSWITH|STARTSWITH|TRIM)\b</string>
+			<string>\b(CONCAT|INDEXOF|LAST_INDEX_OF|LCFIRST|LOWER|REGEX_EXTRACT|REGEX_EXTRACT_ALL|REPLACE|SIZE|STRSPLIT|SUBSTRING|TOKENIZE|TRIM|UCFIRST|UPPER|LTRIM|RTRIM|ENDSWITH|STARTSWITH|TRIM|EqualsIgnoreCase|SPRINTF|STRSPLITTOBAG|UniqueID)\b</string>
 			<key>name</key>
 			<string>support.function.udf.string.pig</string>
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>\b(AddDuration|CurrentTime|DaysBetween|GetDay|GetHour|GetMilliSecond|GetMinute|GetMonth|GetSecond|GetWeek|GetWeekYear|GetYear|HoursBetween|MilliSecondsBetween|MinutesBetween|MonthsBetween|SecondsBetween|SubtractDuration|ToDate|WeeksBetween|YearsBetween|ToMilliSeconds|ToString|ToUnixTime)\b</string>
+			<string>\b(AddDuration|CurrentTime|DaysBetween|GetDay|GetHour|GetMilliSecond|GetMinute|GetMonth|GetSecond|GetWeek|GetWeekYear|GetYear|HoursBetween|MilliSecondsBetween|MinutesBetween|MonthsBetween|SecondsBetween|SubtractDuration|ToDate|ToMilliseconds|WeeksBetween|YearsBetween|ToMilliSeconds|ToString|ToUnixTime)\b</string>
 			<key>name</key>
 			<string>support.function.udf.datetime.pig</string>
 		</dict>
@@ -194,6 +194,25 @@
 			<key>end</key>
 			<string>;?$</string>
 		</dict>
+		<dict>
+			<key>begin</key>
+			<string>(?i)^\s*(fs|sh|clear|exec|help|history|kill|quit|run)\s+(.*)</string>
+			<key>beginCaptures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>keyword.parameter.pig</string>
+				</dict>
+				<key>2</key>
+				<dict>
+					<key>name</key>
+					<string>string.other.pig</string>
+				</dict>
+			</dict>
+			<key>end</key>
+			<string>$</string>
+		</dict>
 	</array>
 	<key>scopeName</key>
 	<string>source.pig</string>