diff --git a/.gitignore b/.gitignore
index 074d01e..0acd3a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 *.o
+*.pcm
+*.cxx
 
 test
 FSUDAQ
diff --git a/DigitizerClass.cpp b/DigitizerClass.cpp
index effea10..262f685 100644
--- a/DigitizerClass.cpp
+++ b/DigitizerClass.cpp
@@ -171,7 +171,8 @@ int Digitizer::OpenDigitizer(int boardID, int portID, bool verbose){
 }
 
 int Digitizer::CloseDigitizer(){
-  
+
+  if( !isConnected ) return 0;
   isConnected = false;
   printf("-------- Closing Digtizer Board : %d Port : %d \n", boardID, portID);
   printf("  Model %s with handle %d using %s\n", BoardInfo.ModelName, handle, LinkType == CAEN_DGTZ_USB ? "USB" : "Optical Link");
diff --git a/FSUDAQDict.cxx b/FSUDAQDict.cxx
deleted file mode 100644
index 5491f3d..0000000
--- a/FSUDAQDict.cxx
+++ /dev/null
@@ -1,150 +0,0 @@
-// Do NOT change. Changes will be lost next time file is generated
-
-#define R__DICTIONARY_FILENAME FSUDAQDict
-
-/*******************************************************************/
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#define G__DICTIONARY
-#include "RConfig.h"
-#include "TClass.h"
-#include "TDictAttributeMap.h"
-#include "TInterpreter.h"
-#include "TROOT.h"
-#include "TBuffer.h"
-#include "TMemberInspector.h"
-#include "TInterpreter.h"
-#include "TVirtualMutex.h"
-#include "TError.h"
-
-#ifndef G__ROOT
-#define G__ROOT
-#endif
-
-#include "RtypesImp.h"
-#include "TIsAProxy.h"
-#include "TFileMergeInfo.h"
-#include <algorithm>
-#include "TCollectionProxyInfo.h"
-/*******************************************************************/
-
-#include "TDataMember.h"
-
-// Since CINT ignores the std namespace, we need to do so in this file.
-namespace std {} using namespace std;
-
-// Header files passed as explicit arguments
-#include "FSUDAQ.h"
-
-// Header files passed via #pragma extra_include
-
-namespace ROOT {
-   static TClass *MainWindow_Dictionary();
-   static void MainWindow_TClassManip(TClass*);
-   static void delete_MainWindow(void *p);
-   static void deleteArray_MainWindow(void *p);
-   static void destruct_MainWindow(void *p);
-
-   // Function generating the singleton type initializer
-   static TGenericClassInfo *GenerateInitInstanceLocal(const ::MainWindow*)
-   {
-      ::MainWindow *ptr = 0;
-      static ::TVirtualIsAProxy* isa_proxy = new ::TIsAProxy(typeid(::MainWindow));
-      static ::ROOT::TGenericClassInfo 
-         instance("MainWindow", "FSUDAQ.h", 25,
-                  typeid(::MainWindow), ::ROOT::Internal::DefineBehavior(ptr, ptr),
-                  &MainWindow_Dictionary, isa_proxy, 0,
-                  sizeof(::MainWindow) );
-      instance.SetDelete(&delete_MainWindow);
-      instance.SetDeleteArray(&deleteArray_MainWindow);
-      instance.SetDestructor(&destruct_MainWindow);
-      return &instance;
-   }
-   TGenericClassInfo *GenerateInitInstance(const ::MainWindow*)
-   {
-      return GenerateInitInstanceLocal((::MainWindow*)0);
-   }
-   // Static variable to force the class initialization
-   static ::ROOT::TGenericClassInfo *_R__UNIQUE_DICT_(Init) = GenerateInitInstanceLocal((const ::MainWindow*)0x0); R__UseDummy(_R__UNIQUE_DICT_(Init));
-
-   // Dictionary for non-ClassDef classes
-   static TClass *MainWindow_Dictionary() {
-      TClass* theClass =::ROOT::GenerateInitInstanceLocal((const ::MainWindow*)0x0)->GetClass();
-      MainWindow_TClassManip(theClass);
-   return theClass;
-   }
-
-   static void MainWindow_TClassManip(TClass* ){
-   }
-
-} // end of namespace ROOT
-
-namespace ROOT {
-   // Wrapper around operator delete
-   static void delete_MainWindow(void *p) {
-      delete ((::MainWindow*)p);
-   }
-   static void deleteArray_MainWindow(void *p) {
-      delete [] ((::MainWindow*)p);
-   }
-   static void destruct_MainWindow(void *p) {
-      typedef ::MainWindow current_t;
-      ((current_t*)p)->~current_t();
-   }
-} // end of namespace ROOT for class ::MainWindow
-
-namespace {
-  void TriggerDictionaryInitialization_FSUDAQDict_Impl() {
-    static const char* headers[] = {
-"FSUDAQ.h",
-0
-    };
-    static const char* includePaths[] = {
-"/usr/local/cern/include",
-"/home/catrina/FSUDAQ/",
-0
-    };
-    static const char* fwdDeclCode = R"DICTFWDDCLS(
-#line 1 "FSUDAQDict dictionary forward declarations' payload"
-#pragma clang diagnostic ignored "-Wkeyword-compat"
-#pragma clang diagnostic ignored "-Wignored-attributes"
-#pragma clang diagnostic ignored "-Wreturn-type-c-linkage"
-extern int __Cling_Autoloading_Map;
-class __attribute__((annotate("$clingAutoload$FSUDAQ.h")))  MainWindow;
-)DICTFWDDCLS";
-    static const char* payloadCode = R"DICTPAYLOAD(
-#line 1 "FSUDAQDict dictionary payload"
-
-#ifndef G__VECTOR_HAS_CLASS_ITERATOR
-  #define G__VECTOR_HAS_CLASS_ITERATOR 1
-#endif
-
-#define _BACKWARD_BACKWARD_WARNING_H
-#include "FSUDAQ.h"
-
-#undef  _BACKWARD_BACKWARD_WARNING_H
-)DICTPAYLOAD";
-    static const char* classesHeaders[]={
-"MainWindow", payloadCode, "@",
-nullptr};
-
-    static bool isInitialized = false;
-    if (!isInitialized) {
-      TROOT::RegisterModule("FSUDAQDict",
-        headers, includePaths, payloadCode, fwdDeclCode,
-        TriggerDictionaryInitialization_FSUDAQDict_Impl, {}, classesHeaders, /*has no C++ module*/false);
-      isInitialized = true;
-    }
-  }
-  static struct DictInit {
-    DictInit() {
-      TriggerDictionaryInitialization_FSUDAQDict_Impl();
-    }
-  } __TheDictionaryInitializer;
-}
-void TriggerDictionaryInitialization_FSUDAQDict() {
-  TriggerDictionaryInitialization_FSUDAQDict_Impl();
-}
diff --git a/FSUDAQDict_rdict.pcm b/FSUDAQDict_rdict.pcm
deleted file mode 100644
index 9b85e3e..0000000
Binary files a/FSUDAQDict_rdict.pcm and /dev/null differ
diff --git a/Makefile b/Makefile
index da14e97..6c5fff0 100755
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,8 @@ DigitizerPHA.o : DigitizerPHA.cpp DigitizerPHA.h DigitizerClass.o
 DigitizerPSD.o : DigitizerPSD.cpp DigitizerPSD.h DigitizerClass.o
 		$(CC) $(COPTS)  -c DigitizerPSD.cpp
 
-test	:	test.cpp DigitizerClass.o DigitizerPHA.o DigitizerPSD.o 
+test	:	test.cpp DigitizerClass.o DigitizerPHA.o DigitizerPSD.o
+		@echo "--------- making test"
 		$(CC) $(COPTS) -o test test.cpp DigitizerClass.o DigitizerPHA.o DigitizerPSD.o  $(CAENLIBS)