diff --git a/src/Acquire.tex b/src/Acquire.tex
index 2583396..28bea0d 100644
--- a/src/Acquire.tex
+++ b/src/Acquire.tex
@@ -11,7 +11,7 @@
 
 \section{Overview of Operation}
 \label{sec:overview-operation}
-\index{operation}\index{ground station}
+\index{operation}
 Below shows how to run a SatNOGS Optical \gls{ground-station},
 after it has been set up and configured.
 
diff --git a/src/Acronyms.bib b/src/Acronyms.bib
index c0328c8..bfc0e69 100644
--- a/src/Acronyms.bib
+++ b/src/Acronyms.bib
@@ -411,13 +411,13 @@
 @acronym{USB,
   description = {Universal Serial Bus.},
   short = {USB},
-  long = {Pulse per second}
+  long = {Universal Serial Bus}
 }
 
 @acronym{NUC,
   description = {Next Unit of Computing.},
   short = {NUC},
-  long = {Pulse per second}
+  long = {Next Unit of Computing}
 }
 
 @acronym{DC,
diff --git a/src/Ground_Stations.tex b/src/Ground_Stations.tex
index f007643..7d51c8b 100644
--- a/src/Ground_Stations.tex
+++ b/src/Ground_Stations.tex
@@ -11,14 +11,14 @@
 
 \section{Overview of Ground Stations}
 \label{sec:overview-groundstations}
-\index{ground station}\index{camera}
+\index{camera}
 \index{receiver}\index{embedded system}
 \Glspl{ground-station} are a setup of equipment such as \glspl{embedded-system}, cameras,
 \glspl{SDR}, \glspl{antenna}, and receivers, located on Earth, observing space.
 
 
 \section{SatNOGS Ground Stations}
-\index{ground station}
+
 
 
 The \gls{LSF} built the \gls{SatNOGS} network using distributed,
@@ -37,7 +37,7 @@ It shows a \gls{SatNOGS} \gls{ground-station} with \gls{VHF} (right) and \gls{UH
 		\includegraphics[keepaspectratio=true,height=1.00\textheight,width=1.00\textwidth,angle=0]{spacecruft-rotator.png}
 		\caption{SatNOGS ground station with antennas.}
 		\label{fig:spacecruft-rotator}
-		\index{radio}\index{ground station}
+		\index{radio}
 	\end{center}
 \end{figure}
 
@@ -51,13 +51,13 @@ as the example in figure \ref{fig:satnogs-ground-station-web}, page \pageref{fig
 		\includegraphics[keepaspectratio=true,height=1.00\textheight,width=1.00\textwidth,angle=0]{satnogs-ground-station-web.png}
 		\caption{Ground station viewed on SatNOGS website, example.}
 		\label{fig:satnogs-ground-station-web}
-		\index{ground station}
+		
 	\end{center}
 \end{sidewaysfigure}
 
 
 \section{SatNOGS Optical Ground Stations}
-\index{ground station}
+
 The \gls{LSF} is developing \gls{SatNOGS-Optical} to add
 \glspl{optical-ground-station} to the network.
 
diff --git a/src/Hardware.tex b/src/Hardware.tex
index d913d95..b765e02 100644
--- a/src/Hardware.tex
+++ b/src/Hardware.tex
@@ -11,7 +11,7 @@
 
 \section{Overview of Hardware}
 \label{sec:hardware-overview}
-\index{hardware}\index{ground station}
+\index{hardware}
 Hardware considerations for a \gls{SatNOGS-Optical} \gls{ground-station}.
 
 Main hardware components in an optical \gls{ground-station}:
@@ -124,7 +124,7 @@ Comparing \glspl{embedded-system} for \gls{SatNOGS-Optical}.
 
 \section{Example Optical Ground Station with Tracking}
 \label{sec:hardware-tracking-ground-station}
-\index{ground station}\index{mount}\index{track}
+\index{mount}\index{track}
 \index{tripod}
 
 This is an example of a tracking \gls{ground-station}.
diff --git a/src/Introduction.tex b/src/Introduction.tex
index a9dced3..7e9ee5e 100644
--- a/src/Introduction.tex
+++ b/src/Introduction.tex
@@ -11,7 +11,7 @@
 
 The SatNOGS Optical Unofficial Guide documents how to set up and run an
 \gls{optical-ground-station} for the \gls{LSF}'s \gls{SatNOGS} network.
-\index{ground station}
+
 
 % https://network.satnogs.org/
 \begin{figure}[h!]
@@ -34,13 +34,13 @@ images of \glspl{satellite}. Hardware is reviewed, then software to run
 on it, with many options, including what is best. Finally,
 what to do with the data (\gls{IDK}!).
 The chapters that follow are listed below.
-\index{ground station}
+
 
 % Perhaps more LaTeXy ref XXX
 \begin{mdframed}[backgroundcolor=blue!10,linecolor=blue!30]
 \begin{description}
   \item [\Glspl{satellite}] --- What are we looking at?
-  \item [Ground Stations] --- How Earth talks to \glspl{satellite} and back.\index{ground station}
+  \item [Ground Stations] --- How Earth talks to \glspl{satellite} and back.
   \item [\Gls{toolchain} and Process] --- The big picture of what
    hardware and software is needed to set up an optical ground station
    for use on the network.
@@ -62,7 +62,7 @@ The chapters that follow are listed below.
   \item [Support] --- Where development is occurring and questions answered!
 \end{description}
 \end{mdframed}
-\index{ground station}\index{process}\index{hardware}\index{software}
+\index{process}\index{hardware}\index{software}
 \index{acquire}\index{solve}\index{detect}\index{identify}\index{upload}
 \index{support}\index{plate solver}
 
@@ -72,7 +72,7 @@ The chapters that follow are listed below.
 The \gls{LSF} supports
 ``free and accessible space for all, creating \gls{open-source} space technologies.''%
 \footnote{\url{https://libre.space}}
-\index{Open Source}
+
 
 \begin{figure}[h!]
 	\begin{framed}
@@ -99,7 +99,7 @@ Select \gls{LSF} projects:
 
 \section{SatNOGS Network}
 SatNOGS is the \gls{LSF}'s global network of \gls{satellite} ground stations.
-\index{ground station}
+
 
 \begin{figure}[h!]
 	\begin{framed}
diff --git a/src/SNOUG.tex b/src/SNOUG.tex
index 52eea13..6962245 100644
--- a/src/SNOUG.tex
+++ b/src/SNOUG.tex
@@ -233,17 +233,31 @@ leftmargin=1cm,rightmargin=1cm
 % use first field instead of name field
 %\renewcommand*{\glsxtrautoindexentry}[1]{\string\glsentryfirst{#1}}
 
-% use long form for the sort value, if provided:
-%\renewcommand*{\glsxtrautoindexassignsort}[2]{%
-%  \ifglshaslong{#2}%
-%  {\glsletentryfield{#1}{#2}{long}}%
-%  {\glsletentryfield{#1}{#2}{sort}}%
+% Use long for index
+% GOOD, but no acronym in the index
+%\renewcommand*{\glsxtrautoindexentry}[1]{\string\glsentrylong{#1}}
+% TEST XXX, ok, but () on glossary words too, not just acronym
+\renewcommand*{\glsxtrautoindexentry}[1]{\string\glsentrylong{#1} (\glsentryshort{#1})}
+% TEST XXX
+%\renewcommand*{\glsxtrautoindexentry}[1]{%
+%  \ifglshaslong{#1}%
+%  {\string\glsentrylong{#1} (\glsentryshort{#1})}
 %}
+% TEST XXX
+%\renewcommand*{\glsxtrautoindexentry}[1]{\string\glsentrylong{#1} \textsc{\glsentryshort{#1}}}
 
-\renewcommand*{\glsxtrpostdescacronym}{%
- \space(\textsc{origin:} \glsentrylong{\glscurrententrylabel})%
+% use long form for the sort value, if provided:
+\renewcommand*{\glsxtrautoindexassignsort}[2]{%
+  \ifglshaslong{#2}%
+  {\glsletentryfield{#1}{#2}{long}}%
+  {\glsletentryfield{#1}{#2}{sort}}%
 }
 
+% OK, shows description, then origin
+%\renewcommand*{\glsxtrpostdescacronym}{%
+% \space(\textsc{origin:} \glsentrylong{\glscurrententrylabel})%
+
+
 % Index glossary, abbreviations, acronyms
 \glssetcategoryattribute{general}{dualindex}{hyperpage}
 \glssetcategoryattribute{abbreviation}{dualindex}{hyperpage}
diff --git a/src/SatNOGS_Optical.tex b/src/SatNOGS_Optical.tex
index 497c27b..c79dcc4 100644
--- a/src/SatNOGS_Optical.tex
+++ b/src/SatNOGS_Optical.tex
@@ -16,7 +16,7 @@ ground stations.
 
 This chapter gives a top level review what is needed in terms of hardware and
 software to build an operating optical ground station.
-\index{hardware}\index{software}\index{ground station}
+\index{hardware}\index{software}
 
 
 \section{Toolchain}
diff --git a/src/Software.tex b/src/Software.tex
index 14a2e29..cfec4c0 100644
--- a/src/Software.tex
+++ b/src/Software.tex
@@ -62,7 +62,7 @@ sudo apt install python3-virtualenv python3-pip python3-dev \
     astrometry-data-tycho2-08 astrometry-data-tycho2-09 \
     astrometry-data-tycho2-10-19
 \end{minted}
-\index{virtualenv}\index{astrometry.net}
+\index{virtualenv}
 \index{Giza}\index{Source Extractor}
 
 Next, install the \texttt{\gls{hough3d-code}} dependency.
@@ -192,7 +192,7 @@ export ST_LOGIN="identity=foo@no:pass"
 
 Set \texttt{astrometry.net} to run in parallel, assuming you have enough \gls{RAM}:
 (This doesn't appear to work? Breaks?).
-\index{astrometry.net}
+
 
 \begin{minted}{sh}
 sudo vim /etc/astrometry.cfg
@@ -611,7 +611,7 @@ When mount control is functioning, a location on the \gls{sky-chart}, such as a
 Using this, a \gls{telescope} mount can be used to easily point the camera at a location
 and track it to observe \glspl{telescope}. It should also provide a superior \gls{FITS} file
 for extracting data than using a static mount (XXX made up).
-\index{sky-chart}\index{mount}\index{track}
+\index{mount}\index{track}
 \index{camera}
 
 To use a \gls{telescope} tracking mount for use with \texttt{stvid}, the following steps need to be performed in
diff --git a/src/Solve.tex b/src/Solve.tex
index a6cbebc..2129cc4 100644
--- a/src/Solve.tex
+++ b/src/Solve.tex
@@ -48,7 +48,7 @@ See below for a list of \glspl{plate-solver} that can be used.
  \item Watney.
 \end{itemize}
 \end{mdframed}
-\index{astrometry.net}\index{astap}\index{Watney}
+\index{astap}\index{Watney}
 
 
 \section{Source Extractor}
@@ -63,7 +63,7 @@ widely used for many years.
 
 
 \section{astrometry.net}
-\index{astrometry.net}
+
 Astrometry.net is a website and software that can be run locally to solve
 a plate of stars that has been extracted from \texttt{Source Extractor}. XXX
 \index{Source Extractor}
@@ -75,7 +75,7 @@ a plate of stars that has been extracted from \texttt{Source Extractor}. XXX
         \includegraphics[keepaspectratio=true,height=0.60\textheight,width=0.60\textwidth,angle=0]{astrometry-web.png}
         \caption{nova.astrometry.net website.}
         \label{fig:astrometry-web-web}
-        \index{astrometry.net}
+        
 	\end{framed}
 \end{figure}
 
@@ -85,7 +85,7 @@ a plate of stars that has been extracted from \texttt{Source Extractor}. XXX
                 \textcolor{red}{NOTICE:} \\
                 Using astrometry.net online requires an account with non-\gls{libre} services.
 		The astrometry.net software can be installed locally to avoid this.
-                \index{proprietary}\index{astrometry.net}
+                \index{proprietary}
         }
 }