diff --git a/Makefile b/Makefile
index e9e8551..d400521 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,10 @@
+BUILDPATH:=$(shell find $$PUBSENGINE_ROOT/.stack-work/install|grep pkgdb$$|sed -e 's/^.*install.//g')
 default: article
 clean:
 	rm -rf _build
 thesis:
 	rm -rf _build/auto
-	GHC_PACKAGE_PATH=${PUBSENGINE_ROOT}/.stack-work/install/x86_64-linux-tinfo6/3d751d21e6b97977106d82e2ec3961638329963dd4d98bc4115204782f5d4168/8.10.7/pkgdb:${HOME}/.stack/snapshots/x86_64-linux-tinfo6/3d751d21e6b97977106d82e2ec3961638329963dd4d98bc4115204782f5d4168/8.10.7/pkgdb:${GHC_PACKAGE_PATH} pubsEngine manuscript thesis
+	GHC_PACKAGE_PATH=${PUBSENGINE_ROOT}/.stack-work/install/${BUILDPATH}:${HOME}/.stack/snapshots/${BUILDPATH}:${GHC_PACKAGE_PATH} pubsEngine manuscript thesis
 article:
 	rm -rf _build/auto
-	GHC_PACKAGE_PATH=${PUBSENGINE_ROOT}/.stack-work/install/x86_64-linux-tinfo6/3d751d21e6b97977106d82e2ec3961638329963dd4d98bc4115204782f5d4168/8.10.7/pkgdb:${HOME}/.stack/snapshots/x86_64-linux-tinfo6/3d751d21e6b97977106d82e2ec3961638329963dd4d98bc4115204782f5d4168/8.10.7/pkgdb:${GHC_PACKAGE_PATH} pubsEngine manuscript article
+	GHC_PACKAGE_PATH=${PUBSENGINE_ROOT}/.stack-work/install/${BUILDPATH}:${HOME}/.stack/snapshots/${BUILDPATH}:${GHC_PACKAGE_PATH} pubsEngine manuscript article
diff --git a/manuscript.md b/manuscript.md
index e03d639..e5124b9 100644
--- a/manuscript.md
+++ b/manuscript.md
@@ -188,7 +188,7 @@ Table creation will be described in another section (Enhancement by pubsEngine).
 ![the caption](Figure/icml_numpapers.eps){#fig:FigVibStab size=0.5}
 ~~~
 
-will produce Figure [@fig:FigVibStab].
+will produce [Figure @fig:FigVibStab].
 Make sure that you calculated by yourself the appropriate width and height for the image to fit in a column.
 Full width image and automatic sized image for single-column will be described at another section (Enhancement by pubsEngine). Please be aware that `size` is considered as a multiplier of the `\linewidth`.
 
@@ -470,7 +470,7 @@ print("""
 | as | dd |
 |----|----|
 | dd | dd |
-[Table: this is output of a python script]
+[This is output of a python script]
 """)
 print("~~~")
 ~~~
@@ -923,7 +923,7 @@ Table: Simple table using default markdown table. Currently not working in two-c
 <!-- calculate height and width of picture manually in inch, using evince -> Properties
 create label for \ref{FigVibStab} using #FigVibStab
 -->
-![Vibrational stability equation of state $S_{\mathrm{vib}}(\lg e, \lg \rho)$. $>0$ means vibrational stability.](Figure/icml_numpapers.eps){#fig:FigVibStab width=3.43in height=2.71in}
+![Vibrational stability equation of state $S_{\mathrm{vib}}(\lg e, \lg \rho)$. $>0$ means vibrational stability.](Figure/icml_numpapers.eps){#fig:FigVibStab2 width=3.43in height=2.71in}
 
 <!--
    \begin{figure}
diff --git a/pandoc-crossref.yaml b/pandoc-crossref.yaml
new file mode 100644
index 0000000..231a35d
--- /dev/null
+++ b/pandoc-crossref.yaml
@@ -0,0 +1,3 @@
+cref: true
+figureTemplate: "$$t$$"
+tableTemplate: "$$t$$"