diff --git a/Makefile b/Makefile
index 52aa79cf0dccf2801debede4a1ca18ae1a4ee718..f1f24572340a5487a5fba1dab0cc7230746a9121 100644
--- a/Makefile
+++ b/Makefile
@@ -36,9 +36,9 @@
 CXX= g++
 CC = $(CXX)
 LD = $(CXX)
-DEBUG = -ggdb3
+#DEBUG = -ggdb3
 RANLIB = ranlib
-#OPTIM = -O2
+OPTIM = -O2
 
 INCLUDE = -I include
 CXXFLAGS += -std=c++17 -fPIC -D_REENTRANT $(DEBUG) $(OPTIM) $(WARN) $(INCLUDE)
@@ -107,8 +107,8 @@ WARN+= -pedantic -Wno-long-long # test with mysql due to long long variables!
 
 #######################################
 #options for coverage and performance analysis
-DEBUG += -fprofile-arcs -ftest-coverage -pg
-LDFLAGS += -fprofile-arcs -ftest-coverage -pg
+#DEBUG += -fprofile-arcs -ftest-coverage -pg
+#LDFLAGS += -fprofile-arcs -ftest-coverage -pg
 #####################################
 
 # Compile source files to object files
@@ -198,7 +198,7 @@ localinstall: lib
 	install -d $(LOCALDESTDIRLIB)
 	install -d $(LOCALDESTDIRHEADERS)
 	install $(PROJECTHOME)/lib/$(DT_SHLIB) $(LOCALDESTDIRLIB)
-	install $(INSTHEADERS) $(LOCALDESTDIRHEADERS)
+	cd include; install $(INSTHEADERS) $(LOCALDESTDIRHEADERS); cd ..
 	rm -f $(LOCALDESTDIRLIB)/$(SHLIB)
 	rm -f $(LOCALDESTDIRLIB)/$(DT_SONAME)
 	cd $(LOCALDESTDIRLIB); ln -s $(DT_SHLIB) $(SHLIB);ln -s $(DT_SHLIB) $(DT_SONAME)
@@ -207,7 +207,7 @@ install: lib
 	install -d $(DESTDIRLIB)
 	install -d $(DESTDIRHEADERS)
 	install $(PROJECTHOME)/lib/$(DT_SHLIB) $(DESTDIRLIB)
-	install $(INSTHEADERS) $(DESTDIRHEADERS)
+	cd include; install $(INSTHEADERS) $(DESTDIRHEADERS); cd ..
 	rm -f $(DESTDIRLIB)/$(SHLIB)
 	rm -f $(DESTDIRLIB)/$(DT_SONAME)
 	cd $(DESTDIRLIB); ln -s $(DT_SHLIB) $(SHLIB);ln -s $(DT_SHLIB) $(DT_SONAME)