diff --git a/src/Ground_Stations.tex b/src/Ground_Stations.tex
index 0282866..9385bc7 100644
--- a/src/Ground_Stations.tex
+++ b/src/Ground_Stations.tex
@@ -32,7 +32,7 @@ It shows a \gls{SatNOGS} \gls{ground-station} with \gls{VHF} (right) and \gls{UH
 	\begin{center}
 		\centering
 		\includegraphics[keepaspectratio=true,height=1.00\textheight,width=1.00\textwidth,angle=0]{spacecruft-rotator.png}
-		\caption{SatNOGS ground station with antennas.}
+		\caption{\gls{SatNOGS} \gls{ground-station} with antennas.}
 		\label{fig:spacecruft-rotator}
 	\end{center}
 \end{figure}
@@ -67,7 +67,7 @@ can be seen in figure
 	\begin{center}
 		\centering
 		\includegraphics[keepaspectratio=true,height=1.00\textheight,width=1.00\textwidth,angle=0]{video-enclosure-mount-tripod.png}
-		\caption{SatNOGS Optical ground station prototype.}
+		\caption{\gls{SatNOGS-Optical} \gls{ground-station} prototype.}
 		\label{fig:video-enclosure-mount-tripod}
 		\index{tripod}\index{mount}\index{enclosure}
 	\end{center}
diff --git a/src/Hardware.tex b/src/Hardware.tex
index c647575..a6bff52 100644
--- a/src/Hardware.tex
+++ b/src/Hardware.tex
@@ -439,7 +439,7 @@ space walks, using hand guided \glspl{telescope} with low cost \gls{CCD} imagers
 % XXX ref
 
 There are few options for satellite tracking mounts.
-Some new iOptron \gls{telescope mount} \gls{firmware} supports tracking
+Some new iOptron \gls{telescope} mount \gls{firmware} supports tracking
 satellites. This has been largely untested so far, but at present
 is likely the best option, if a satellite tracking mount is wanted.
 \index{iOptron}\index{track}\index{mount}
diff --git a/src/Introduction.tex b/src/Introduction.tex
index 8d2ed4b..5de55e7 100644
--- a/src/Introduction.tex
+++ b/src/Introduction.tex
@@ -38,19 +38,19 @@ The chapters that follow are listed below.
 \begin{mdframed}[backgroundcolor=blue!10,linecolor=blue!30]
 \begin{description}
   \item [\Glspl{satellite}] --- What are we looking at?
-  \item [\Glspl{ground-stations}] --- How Earth talks to \glspl{satellite} and back.
+  \item [\Glspl{ground-station}] --- 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 \gls{optical-ground-station}
    for use on the network.
   \item [Hardware] --- Details on appropriate hardware configurations,
    and example setups.
   \item [Software] --- A look at the myriad software related to \glspl{satellite},
-   and what works best at present for \gls{SatNOGS Optical}.
+   and what works best at present for \gls{SatNOGS-Optical}.
   \item [Acquire] --- Convert \glspl{photon} to bits. Pointing a camera at the
    sky works.\index{camera}
   \item [Solve] --- Pictures of stars reveal the time and location of
    the photo. \Glspl{plate-solver} reviewed.
-  \item [Detect] --- The plate solver says where the photo is,
+  \item [Detect] --- The \gls{plate-solver} says where the photo is,
    now detect if are there moving trails that aren't \glspl{star-trail} that could
    be \glspl{satellite}.
   \item [Identify] --- With time, location, \gls{satellite} detection, \glspl{TLE}
diff --git a/src/SatNOGS_Optical.tex b/src/SatNOGS_Optical.tex
index 908dd51..5e962d5 100644
--- a/src/SatNOGS_Optical.tex
+++ b/src/SatNOGS_Optical.tex
@@ -42,7 +42,7 @@ See figure \ref{fig:snopo}, page \pageref{fig:snopo}, described below.
 \begin{sidewaysfigure}[p!]
 	\begin{center}
 	\includegraphics[keepaspectratio=true,height=1.00\textheight,width=1.00\textwidth,angle=0]{SNOPO.png}
-	\caption{\gls{SatNOGS Optical} Process Overview}
+	\caption{\gls{SatNOGS-Optical} Process Overview}
 	\label{fig:snopo}
 	\index{process}
 	\end{center}
diff --git a/src/Satellites.tex b/src/Satellites.tex
index a306148..663f585 100644
--- a/src/Satellites.tex
+++ b/src/Satellites.tex
@@ -19,7 +19,7 @@ antention to ones using \gls{amateur-radio} bands.
 \section{SatNOGS DB}
 \label{sec:satnogs-db}
 
-The \gls{SatNOGS DB} is a database that lists \glspl{satellite},
+The \gls{SatNOGS-DB} is a database that lists \glspl{satellite},
 many of which can be tracked by \gls{ground-station} operators on the
 \gls{SatNOGS} network.
 
@@ -27,9 +27,8 @@ many of which can be tracked by \gls{ground-station} operators on the
 	\begin{framed}
 	\centering
         \includegraphics[keepaspectratio=true,height=0.80\textheight,width=0.80\textwidth,angle=0]{satnogs-db-web.png}
-        \caption{SatNOGS DB website.}
+        \caption{\gls{SatNOGS-DB} website.}
         \label{fig:satnogs-db-web}
-        \index{SatNOGS DB}
 	\end{framed}
 \end{figure}
 
@@ -41,7 +40,7 @@ Individual \glspl{satellite} can be viewed, such as the RamSat \Gls{cubesat}.
 	\begin{framed}
 	\centering
         \includegraphics[keepaspectratio=true,height=0.60\textheight,width=0.60\textwidth,angle=0]{satnogs-db-ramsat-web.png}
-        \caption{SatNOGS DB RamSat CubeSat web page.}
+        \caption{\gls{SatNOGS-DB} RamSat CubeSat web page.}
         \label{fig:satnogs-db-ramsat-web}
         \index{RamSat}
 	\end{framed}
@@ -55,7 +54,7 @@ See the RamSat \gls{telemetry} dashboard.
 \begin{sidewaysfigure}[p!]
 	\centering
         \includegraphics[keepaspectratio=true,height=1.00\textheight,width=1.00\textwidth,angle=0]{satnogs-telemetry-ramsat-web.png}
-        \caption{SatNOGS DB RamSat CubeSat telemetry web page.}
+        \caption{\gls{SatNOGS-DB} RamSat \gls{CubeSat} \gls{telemetry} web page.}
         \label{fig:satnogs-telemetry-ramsat-web}
         \index{RamSat}
 \end{sidewaysfigure}
diff --git a/src/Software.tex b/src/Software.tex
index 295e6bd..cb98815 100644
--- a/src/Software.tex
+++ b/src/Software.tex
@@ -26,7 +26,7 @@ for a diagram with an overview of the software process.
                         back arrow distance=0.75,
                 }
                 \smartdiagram[flow diagram:horizontal]{Acquire, Process, Analyze, Upload}
-                \caption{\gls{SatNOGS Optical} Operation Pipeline}
+                \caption{\gls{SatNOGS-Optical} Operation Pipeline}
                 \label{fig:operation}
                 \index{operation}
 %	\end{framed}
@@ -218,7 +218,7 @@ My fork:
 \begin{sidewaysfigure}[p!]
         \begin{center}
                 \includegraphics[keepaspectratio=true,height=1.00\textheight,width=1.00\textwidth,angle=0]{skymap-giza-21.png}
-                \caption{\texttt{skymap} example screenshot.}
+                \caption{\texttt{\gls{skymap}} example screenshot.}
 		\label{fig:skymap-giza-21}
         \end{center}
 \end{sidewaysfigure}
@@ -665,7 +665,7 @@ An overview of steps:
 \begin{sidewaysfigure}[p!]
         \begin{center}
                 \includegraphics[keepaspectratio=true,height=1.00\textheight,width=1.00\textwidth,angle=0]{kstars-skychart.png}
-                \caption{\gls{KStars} \gls{sky chart}, example screenshot.}
+                \caption{\gls{KStars} \gls{sky-chart}, example screenshot.}
                 \label{fig:kstars-skychart}
         \end{center}
 \end{sidewaysfigure}