diff --git a/CHANGES.rst b/CHANGES.rst
index b8d9b91..1592fde 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -13,7 +13,8 @@ are now accepted. Short option ``-f`` is associated with ``-file`` rather than `
 Option ``--read`` with alias ``-r`` is now ``-code`` and short option `-c`.
 
 Toggling Autobrace using f4 was fixed.
-You can cycle now through pygments styles up using f5 (next style) and f6 (previous style). f1 (help) now show function key
+
+You can cycle now through pygments styles up using f5 (next style) and f6 (previous style). f1 (help) now shows function key
 bindings in bottom bar.
 
 
diff --git a/MANIFEST.in b/MANIFEST.in
index bd3e0f2..ac58d1b 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,5 @@
 include README.rst
-include NEWS.md
+include CHANGES.rst
 include ChangeLog
 include COPYING.txt
 include Makefile
diff --git a/mathicsscript/completion.py b/mathicsscript/completion.py
index c70cc4a..e0e1ef1 100644
--- a/mathicsscript/completion.py
+++ b/mathicsscript/completion.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2021-2022, 2024 Rocky Bernstein <rb@dustyfeet.com>
+# Copyright (C) 2021-2022, 2024-2025 Rocky Bernstein <rb@dustyfeet.com>
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
 #   the Free Software Foundation, either version 3 of the License, or
@@ -28,12 +28,12 @@
 
 SYMBOLS = rf"[`]?({Regex.IDENTIFIER}|{Regex.NAMED_CHARACTER})(`({Regex.IDENTIFIER}|{Regex.NAMED_CHARACTER}))+[`]?"
 
-if False:  # FIXME reinstate this
-    NAMED_CHARACTER_START = rf"\\\[{Regex.IDENTIFIER}"
-    FIND_MATHICS_WORD_RE = re.compile(
-        rf"({NAMED_CHARACTER_START})|(?:.*[\[\(])?({SYMBOLS}$)"
-    )
+# # The below is a more precise definition for a Mathics3 "word" or
+# # "identifier", but it is wrong somehow.  NAMED_CHARACTER_START =
+# rf"\\\[{Regex.IDENTIFIER}" FIND_MATHICS_WORD_RE = re.compile(
+# rf"({NAMED_CHARACTER_START})|(?:.*[\[\(])?({SYMBOLS}$)" )
 FIND_MATHICS_WORD_RE = re.compile(r"((?:\[)?[^\s\[\(\{]+)")
+
 CHARGROUP_START = frozenset(["(", "[", "{", ","])
 
 
diff --git a/mathicsscript/version.py b/mathicsscript/version.py
index 57739da..f00a9bb 100644
--- a/mathicsscript/version.py
+++ b/mathicsscript/version.py
@@ -4,4 +4,4 @@
 # well as importing into Python. That's why there is no
 # space around "=" below.
 # fmt: off
-__version__="8.0.1.dev0"  # noqa
+__version__="9.0.0.dev0"  # noqa
diff --git a/pyproject.toml b/pyproject.toml
index 3efcab3..34e841a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -24,7 +24,7 @@ dependencies = [
 ]
 requires-python = ">=3.9"
 readme = "README.rst"
-license = {text = "GPL-3.0-only"}
+license = "GPL-3.0-or-later"
 keywords = ["Mathematica", "Wolfram", "Interpreter", "Shell", "Math", "CAS"]
 maintainers = [
     {name = "Mathics3 Group"},
@@ -32,7 +32,6 @@ maintainers = [
 classifiers = [
     "Intended Audience :: Developers",
     "Intended Audience :: Science/Research",
-    "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",