diff --git a/src/powerquery/powerquery.test.ts b/src/powerquery/powerquery.test.ts
index 4fe0f2bc..87eff8e5 100644
--- a/src/powerquery/powerquery.test.ts
+++ b/src/powerquery/powerquery.test.ts
@@ -116,6 +116,27 @@ testTokenization('powerquery', [
 	}],
 
 	// Number formats
+	[{
+		line: '0Xabc',
+		tokens: [
+			{ startIndex: 0, type: 'number.hex.pq' }
+		]
+	}],
+
+	[{
+		line: '0xA',
+		tokens: [
+			{ startIndex: 0, type: 'number.hex.pq' }
+		]
+	}],
+
+	[{
+		line: '1e1',
+		tokens: [
+			{ startIndex: 0, type: 'number.pq' }
+		]
+	}],
+
 	[{
 		line: '5 / 1.2e+2 + 0x1234abc',
 		tokens: [
@@ -280,4 +301,17 @@ testTokenization('powerquery', [
 			{ startIndex: 55, type: "delimiter.pq" }
 		]
 	}],
+
+	[{
+		line: 'isFunctionthen = 1;// comment',
+		tokens: [
+			{ startIndex: 0, type: 'identifier.pq' },
+			{ startIndex: 14, type: 'white.pq' },
+			{ startIndex: 15, type: 'operators.pq' },
+			{ startIndex: 16, type: 'white.pq' },
+			{ startIndex: 17, type: 'number.pq' },
+			{ startIndex: 18, type: 'delimiter.pq' },
+			{ startIndex: 19, type: 'comment.pq' },
+		]
+	}],
 ]);
diff --git a/src/powerquery/powerquery.ts b/src/powerquery/powerquery.ts
index d72fea34..821be411 100644
--- a/src/powerquery/powerquery.ts
+++ b/src/powerquery/powerquery.ts
@@ -97,7 +97,7 @@ export const language = <ILanguage>{
 			[/\d+([eE][\-+]?\d+)?/, "number"],
 
 			// keywords
-			[/(#?[a-z]+)/,
+			[/(#?[a-z]+)\b/,
 				{
 					cases: {
 						"@typeKeywords": "type",
@@ -111,7 +111,7 @@ export const language = <ILanguage>{
 			],
 
 			// other identifiers
-			[/([a-zA-Z_][\w\.]*)/, "identifier"],
+			[/\b([a-zA-Z_][\w\.]*)\b/, "identifier"],
 
 			{ include: "@whitespace" },
 			{ include: "@comments" },