diff --git a/ba/ba1500.cpp b/ba/ba1500.cpp
index edbb33676..3284a50f6 100755
--- a/ba/ba1500.cpp
+++ b/ba/ba1500.cpp
@@ -38,7 +38,7 @@ TInformazione_moduli::TInformazione_moduli()
   TToken_string t;
   TString_array descs;
   
-  ifstream  in("prassi.aut");
+  ifstream  in(AUT_FILE);
   while (!in.eof() && in.good())
   {
     in.getline(s.get_buffer(), s.size());
diff --git a/ba/ba1501.cpp b/ba/ba1501.cpp
index 9e3e53bee..926ea4f2c 100755
--- a/ba/ba1501.cpp
+++ b/ba/ba1501.cpp
@@ -88,7 +88,7 @@ HIDDEN int module2number(const TString& mod)
   if (ass == NULL)
   {
     TString8 num;
-    TScanner scanner("prassi.aut");
+    TScanner scanner(AUT_FILE);
     ass = new TAssoc_array;
     for (int aut = 0; scanner.line() != ""; aut++)
     {
diff --git a/ba/ba1600.cpp b/ba/ba1600.cpp
index 184b6a061..463a532ee 100755
--- a/ba/ba1600.cpp
+++ b/ba/ba1600.cpp
@@ -391,7 +391,7 @@ void TInstall_ini::prices(const char* module, word users,
 
 void TFconv_ini::export_module(const char* module, const char* summary)
 {
-  TScanner scanner("prassi.aut");
+  TScanner scanner(AUT_FILE);
   int module_code;
   for (module_code = 0; scanner.line().not_empty(); module_code++)
   {
diff --git a/ba/ba1700.cpp b/ba/ba1700.cpp
index 6d444df1b..3b4e96bbc 100755
--- a/ba/ba1700.cpp
+++ b/ba/ba1700.cpp
@@ -220,7 +220,7 @@ int TInstaller_mask::get_module_number(const char * module) const
   int aut = -1;
   if (module && * module)
   {
-    TScanner scanner("prassi.aut");
+    TScanner scanner(AUT_FILE);
   
     bool ok = FALSE;
     for (aut = 0; scanner.line() != ""; aut++)
diff --git a/ba/ba2200.cpp b/ba/ba2200.cpp
index 4b4bd7842..4146deb1f 100755
--- a/ba/ba2200.cpp
+++ b/ba/ba2200.cpp
@@ -1,7 +1,10 @@
 #include <direct.h>
-#define XVT_INCL_NATIVE
 
+#ifndef XVAGA
+#define XVT_INCL_NATIVE
 #include <archives.h>
+#endif
+
 #include <automask.h>
 #include <config.h>
 #include <execp.h>
@@ -584,6 +587,9 @@ void TArchive_app::interactive_mode()
           message_box("Inserire il primo disco del backup nel drive %c", floppy_path[0]);
         if (ini_name.exist())
         {
+#ifdef XVAGA
+		  restore(mode, firm, floppy_path);
+#else
           bool use_zip = FALSE;
           { 
             TConfig ini(ini_name, "Main");
@@ -597,6 +603,7 @@ void TArchive_app::interactive_mode()
             TArchive arc;
             arc.restore(mode, firm, floppy_path[0], FALSE);
           }
+#endif
         }
         else
           error_box("Impossibile trovare il file %s", (const char*)ini_name);
diff --git a/ba/ba2300.h b/ba/ba2300.h
index 6f92e6a16..c7a06117e 100755
--- a/ba/ba2300.h
+++ b/ba/ba2300.h
@@ -3,3 +3,4 @@
 #define F_STUDENT  102
 #define F_SOLUTION 103
 #define F_TREE     150
+
diff --git a/ba/ba2300.uml b/ba/ba2300.uml
index 470ee04cb..c2b83c7ca 100755
--- a/ba/ba2300.uml
+++ b/ba/ba2300.uml
@@ -45,4 +45,4 @@ END
 
 ENDPAGE
 
-ENDMASK
\ No newline at end of file
+ENDMASK
diff --git a/ba/ba2600.cpp b/ba/ba2600.cpp
index 21e2fd3a3..b8b0a551a 100755
--- a/ba/ba2600.cpp
+++ b/ba/ba2600.cpp
@@ -1,5 +1,5 @@
 //EDITOR DI MASCHERE
-
+#include <xvt.h>
 #include "ba2600.h"
 
 //Costruttore della classe TEditMask_window: gestisce la maschera
diff --git a/ba/ba2600.h b/ba/ba2600.h
index f7903b5cb..99ca0b199 100755
--- a/ba/ba2600.h
+++ b/ba/ba2600.h
@@ -280,7 +280,7 @@ public:
   // @cmember Ritorna il numero di identificazione dello spreadsheet <find_sheet()>
   virtual int get_idsheet() { return -1;}  
   // @cmember Ritorna una proprietà dello spreadsheet 
-  virtual bool get_hismask() {return -1; }
+  virtual bool get_hismask() {return TRUE; }
   // @cmember Legge i campi principali dalla maschera di supporto
   void get_field(TMask& mask); 
   // @cmember Ritorna la priorità del focus
diff --git a/ba/bainst.cpp b/ba/bainst.cpp
index 3b3ec7af5..40c70532f 100755
--- a/ba/bainst.cpp
+++ b/ba/bainst.cpp
@@ -393,7 +393,7 @@ bool TStd_filename::check(bool verbose,const char * n)
 
 bool TInstallmodule_app::create()
 {
-  TScanner scanner("prassi.aut");
+  TScanner scanner(AUT_FILE);
   
   bool ok = FALSE;
   for (int aut = 0; aut<=module_number(); aut++)
diff --git a/ba/bainst31.cpp b/ba/bainst31.cpp
index df6881fb1..a3650779f 100755
--- a/ba/bainst31.cpp
+++ b/ba/bainst31.cpp
@@ -1,7 +1,8 @@
 #include <config.h>
-#include <utility.h>
 #include <execp.h>
 #include <isam.h>
+#include <tabutil.h>
+#include <utility.h>
 
 #include "bainst.h"
 #include "bainst31.h"
@@ -10,6 +11,7 @@ class TInstall_VE : public TInstallmodule_app
 {
   TMask * _m;
 protected:
+  virtual bool load_default_data() const ;
   virtual int module_number() const {return 31;}
   virtual bool install_firm() {return TRUE;} // no firm installation
 
@@ -17,6 +19,14 @@ public:
   virtual ~TInstall_VE () {}
 };
 
+bool TInstall_VE::load_default_data() const
+{        
+  TTable tip("%TIP");
+  const bool empty = tip.first() != NOERR;
+  
+  return empty;
+}
+
 
 int bainst31(int argc, char** argv)
 { 
diff --git a/ba/bainst32.cpp b/ba/bainst32.cpp
index eeb92094f..8240ed41c 100755
--- a/ba/bainst32.cpp
+++ b/ba/bainst32.cpp
@@ -1,8 +1,9 @@
 #include <applicat.h>
-#include <mask.h>
 #include <config.h>
-#include <utility.h>
 #include <isam.h>
+#include <mask.h>
+#include <tabutil.h>
+#include <utility.h>
 
 #include "bainst.h"
 #include "bainst32.h"
@@ -11,6 +12,7 @@ class TInstall_MG : public TInstallmodule_app
 {
   TMask * _m;
 protected:
+  virtual bool load_default_data() const ;
   virtual int module_number() const {return 32;}
   virtual bool post_installer();