diff --git a/FEATURES.md b/FEATURES.md
index 648ed344..b0e108a5 100644
--- a/FEATURES.md
+++ b/FEATURES.md
@@ -38,7 +38,7 @@ Features that are in ***bold italics*** are planned and not yet implemented.
 
 - Episode
 - Editable ID, name, short and long description
-    - ***Undo/redo***
+    - Undo/redo
 - NPC counts
 
 ## 3D View
@@ -83,7 +83,7 @@ Features that are in ***bold italics*** are planned and not yet implemented.
     - Binary data
     - Strings
 - Labels
-- ***Interpret code called from objects as code***
+- Interpret code called from NPCs and objects as code
 
 ## Script Assembly Editor
 
@@ -101,17 +101,18 @@ Features that are in ***bold italics*** are planned and not yet implemented.
     - ***Missing 0 label***
     - ***Missing floor handlers***
     - ***Missing map designations***
-    - ***Threads (thread, thread_stg) that don't start with a sync***
+    - ***Threads (thread, thread_stg) that don't have a sync***
     - ***Unreachable/unused instructions/data***
         - ***Instructions after "ret" instruction***
         - ***Unused labels***
+    - Unnecessary section markers
 - Errors
     - Invalid syntax
     - Invalid instruction
     - Invalid instruction arguments
     - ***Invalid label references***
     - ***Mark all duplicate labels (the first one is not marked at the moment)***
-- ***Instruction parameter hints***
+- Instruction parameter hints
 - ***Show instruction documentation on hover over***
 - ***Show reserved register usage on hover over***
 - ***When saving, ask user whether to really save when asm contains errors***
diff --git a/src/quest_editor/ui/AssemblyEditorComponent.tsx b/src/quest_editor/ui/AssemblyEditorComponent.tsx
index df7d9507..4feb4b30 100644
--- a/src/quest_editor/ui/AssemblyEditorComponent.tsx
+++ b/src/quest_editor/ui/AssemblyEditorComponent.tsx
@@ -1,5 +1,5 @@
 import { autorun } from "mobx";
-import { editor, languages, MarkerSeverity, Position } from "monaco-editor";
+import { editor, languages, MarkerSeverity, MarkerTag, Position } from "monaco-editor";
 import React, { Component, createRef, ReactNode } from "react";
 import { AutoSizer } from "react-virtualized";
 import { AssemblyAnalyser } from "../scripting/AssemblyAnalyser";
@@ -10,6 +10,7 @@ import CompletionList = languages.CompletionList;
 import ITextModel = editor.ITextModel;
 import IStandaloneCodeEditor = editor.IStandaloneCodeEditor;
 import SignatureHelp = languages.SignatureHelp;
+import IMarkerData = editor.IMarkerData;
 
 const ASM_SYNTAX: languages.IMonarchLanguage = {
     defaultToken: "invalid",
@@ -268,23 +269,28 @@ class MonacoComponent extends Component<MonacoProps> {
             model,
             "psoasm",
             assembly_analyser.warnings
-                .map(warning => ({
-                    severity: MarkerSeverity.Warning,
-                    message: warning.message,
-                    startLineNumber: warning.line_no,
-                    endLineNumber: warning.line_no,
-                    startColumn: warning.col,
-                    endColumn: warning.col + warning.length,
-                }))
+                .map(
+                    (warning): IMarkerData => ({
+                        severity: MarkerSeverity.Hint,
+                        message: warning.message,
+                        startLineNumber: warning.line_no,
+                        endLineNumber: warning.line_no,
+                        startColumn: warning.col,
+                        endColumn: warning.col + warning.length,
+                        tags: [MarkerTag.Unnecessary],
+                    }),
+                )
                 .concat(
-                    assembly_analyser.errors.map(error => ({
-                        severity: MarkerSeverity.Error,
-                        message: error.message,
-                        startLineNumber: error.line_no,
-                        endLineNumber: error.line_no,
-                        startColumn: error.col,
-                        endColumn: error.col + error.length,
-                    })),
+                    assembly_analyser.errors.map(
+                        (error): IMarkerData => ({
+                            severity: MarkerSeverity.Error,
+                            message: error.message,
+                            startLineNumber: error.line_no,
+                            endLineNumber: error.line_no,
+                            startColumn: error.col,
+                            endColumn: error.col + error.length,
+                        }),
+                    ),
                 ),
         );
     };