diff --git a/src/SNOUG.tex b/src/SNOUG.tex
index 6962245..3611cf4 100644
--- a/src/SNOUG.tex
+++ b/src/SNOUG.tex
@@ -230,32 +230,34 @@ leftmargin=1cm,rightmargin=1cm
 
 \GlsXtrEnableIndexFormatOverride
 
-% use first field instead of name field
-%\renewcommand*{\glsxtrautoindexentry}[1]{\string\glsentryfirst{#1}}
+% Adds acronym to index like:
+% World Coordinate System (WCS), 67, 116
+% Adds glossary to index like:
+% photon, xii
+\renewcommand*{\glsxtrautoindexentry}[1]{%
+  \ifglshasshort{#1}%
+  {\string\glsentrylong{#1} (\glsentryshort{#1})}%
+  {\string\glsentrylong{#1}}%
+}
 
-% 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}}}
-
-% use long form for the sort value, if provided:
+% use long form for the sort value in the index, 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})%
+% OK, shows description, then origin. Show origin first better
+\renewcommand*{\glsxtrpostdescacronym}{%
+ \space(\textsc{origin:} \glsentrylong{\glscurrententrylabel})%
+}
+
+% crossref for see:
+\renewcommand*{\glsxtrpostdescgeneral}{%
+\ifglshasfield{see}{\glscurrententrylabel}
+{, \glsxtrusesee{\glscurrententrylabel}}%
+{}%
+}
 
 
 % Index glossary, abbreviations, acronyms