diff --git a/src/common/db_backend_selector.cpp b/src/common/db_backend_selector.cpp
index efa759af..427d9b50 100644
--- a/src/common/db_backend_selector.cpp
+++ b/src/common/db_backend_selector.cpp
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "db_backend_selector.h"
-#include "currency_config.h"
+#include "currency_core/currency_config.h"
 #include "command_line.h"
 #include "db_backend_lmdb.h"
 #include "db_backend_mdbx.h"
diff --git a/src/common/miniupnp_helper.h b/src/common/miniupnp_helper.h
index f779bed7..1fef4fce 100644
--- a/src/common/miniupnp_helper.h
+++ b/src/common/miniupnp_helper.h
@@ -17,7 +17,7 @@ extern "C" {
 }
 
 #include "misc_language.h"
-#include "currency_config.h"
+#include "currency_core/currency_config.h"
 #include "version.h"
 
 namespace tools
diff --git a/src/common/pre_download.h b/src/common/pre_download.h
index 7f3746d5..be960821 100644
--- a/src/common/pre_download.h
+++ b/src/common/pre_download.h
@@ -21,7 +21,7 @@ namespace tools
   };
 
 #ifndef TESTNET
-@todo bookmarking bootstrap file location
+//@todo bookmarking bootstrap file location
   //  static constexpr pre_download_entry c_pre_download_mdbx = { "http://95.217.42.247/pre-download/zano_mdbx_95_1161000.pak", "26660ffcdaf80a43a586e64a1a6da042dcb9ff3b58e14ce1ec9a775b995dc146", 1330022593, 2684313600 };
 //  static constexpr pre_download_entry c_pre_download_lmdb = { "http://95.217.42.247/pre-download/zano_lmdb_95_1161000.pak", "9dd03f08dea396fe32e6483a8221b292be35fa41c29748f119f11c3275956cdc", 1787475468, 2600247296 };
   static constexpr pre_download_entry c_pre_download_mdbx = { "", "", 0, 0 };
diff --git a/src/common/util.cpp b/src/common/util.cpp
index 6fafd6cc..3c64ca5e 100644
--- a/src/common/util.cpp
+++ b/src/common/util.cpp
@@ -9,7 +9,7 @@
 using namespace epee;
 
 #include "util.h"
-#include "currency_config.h"
+#include "currency_core/currency_config.h"
 #include "version.h"
 
 #ifdef WIN32
diff --git a/src/currency_core/basic_pow_helpers.cpp b/src/currency_core/basic_pow_helpers.cpp
index 7becbf8a..ae040571 100644
--- a/src/currency_core/basic_pow_helpers.cpp
+++ b/src/currency_core/basic_pow_helpers.cpp
@@ -11,7 +11,7 @@ using namespace epee;
 #include "currency_format_utils.h"
 #include "serialization/binary_utils.h"
 #include "serialization/stl_containers.h"
-#include "currency_config.h"
+#include "currency_core/currency_config.h"
 #include "crypto/crypto.h"
 #include "crypto/hash.h"
 #include "common/int-util.h"
diff --git a/src/currency_core/blockchain_storage.cpp b/src/currency_core/blockchain_storage.cpp
index 9dcdd9a1..1fe5d923 100644
--- a/src/currency_core/blockchain_storage.cpp
+++ b/src/currency_core/blockchain_storage.cpp
@@ -22,7 +22,7 @@
 #include "blockchain_storage.h"
 #include "currency_format_utils.h"
 #include "currency_boost_serialization.h"
-#include "currency_config.h"
+#include "currency_core/currency_config.h"
 #include "miner.h"
 #include "misc_language.h"
 #include "profile_tools.h"
diff --git a/src/currency_core/currency_basic.h b/src/currency_core/currency_basic.h
index b5aa7fab..aa8a285d 100644
--- a/src/currency_core/currency_basic.h
+++ b/src/currency_core/currency_basic.h
@@ -35,7 +35,7 @@
 #include "serialization/debug_archive.h"
 #include "serialization/keyvalue_serialization.h" // epee key-value serialization
 #include "string_tools.h"
-#include "currency_config.h"
+#include "currency_core/currency_config.h"
 #include "crypto/crypto.h"
 #include "crypto/hash.h"
 #include "crypto/range_proofs.h"
diff --git a/src/currency_config.h b/src/currency_core/currency_config.h
similarity index 97%
rename from src/currency_config.h
rename to src/currency_core/currency_config.h
index 2d18e75b..01231583 100644
--- a/src/currency_config.h
+++ b/src/currency_core/currency_config.h
@@ -19,7 +19,8 @@
 
 #define CURRENCY_MAX_BLOCK_NUMBER                       500000000
 #define CURRENCY_MAX_BLOCK_SIZE                         500000000  // block header blob limit, never used!
-#define CURRENCY_TX_MAX_ALLOWED_OUTS                    2 // effective starting HF4 Zarcanum
+#define CURRENCY_TX_MAX_ALLOWED_OUTS                    2000 // effective starting HF4 Zarcanum
+#define CURRENCY_TX_MIN_ALLOWED_OUTS                    2      // effective starting HF4 Zarcanum
 #define CURRENCY_PUBLIC_ADDRESS_BASE58_PREFIX           0x73f7   // addresses start with 'iT'
 #define CURRENCY_PUBLIC_INTEG_ADDRESS_BASE58_PREFIX     0x6af7  // integrated addresses start with 'iTH'
 #define CURRENCY_PUBLIC_INTEG_ADDRESS_V2_BASE58_PREFIX  0x6af7 // integrated addresses start with 'iTH' (new format)
@@ -29,7 +30,7 @@
 #define CURRENT_TRANSACTION_VERSION                     2
 #define TRANSACTION_VERSION_INITAL                      0
 #define TRANSACTION_VERSION_PRE_HF4                     1
-#define TRANSACTION_VERSION_POST_HF4                    2
+#define TRANSACTION_VERSION_POST_HF4                    ((uint64_t)2)
 #define HF1_BLOCK_MAJOR_VERSION                         1
 #define HF3_BLOCK_MAJOR_VERSION                         2
 #define HF3_BLOCK_MINOR_VERSION                         0
@@ -110,7 +111,7 @@
 
 #ifndef TESTNET
 #define SEED_NODE_HOST                                  "mainnet.lethean.io"
-
+#define SEED_NODE_HOST2                                  "dev.network"
 #define P2P_DEFAULT_PORT                                (36942 + CURRENCY_FORMATION_VERSION)
 #define RPC_DEFAULT_PORT                                36942
 #define STRATUM_DEFAULT_PORT                            36941
@@ -270,10 +271,12 @@
 #define ZANO_HARDFORK_01_AFTER_HEIGHT                   1
 #define ZANO_HARDFORK_02_AFTER_HEIGHT                   2
 #define ZANO_HARDFORK_03_AFTER_HEIGHT                   3
+#define ZANO_HARDFORK_04_AFTER_HEIGHT                   3
 #else
 #define ZANO_HARDFORK_01_AFTER_HEIGHT                   1
 #define ZANO_HARDFORK_02_AFTER_HEIGHT                   2
 #define ZANO_HARDFORK_03_AFTER_HEIGHT                   3
+#define ZANO_HARDFORK_04_AFTER_HEIGHT                   3
 #endif
 
 
diff --git a/src/currency_core/currency_core.cpp b/src/currency_core/currency_core.cpp
index 149375c0..e1a302e6 100644
--- a/src/currency_core/currency_core.cpp
+++ b/src/currency_core/currency_core.cpp
@@ -15,7 +15,7 @@ using namespace epee;
 #include "common/util.h"
 #include "warnings.h"
 #include "crypto/crypto.h"
-#include "currency_config.h"
+#include "currency_core/currency_config.h"
 #include "currency_format_utils.h"
 #include "misc_language.h"
 #include "string_coding.h"
diff --git a/src/currency_core/difficulty.cpp b/src/currency_core/difficulty.cpp
index c3a02c9f..ee631e05 100644
--- a/src/currency_core/difficulty.cpp
+++ b/src/currency_core/difficulty.cpp
@@ -14,7 +14,7 @@
 
 #include "common/int-util.h"
 #include "crypto/hash.h"
-#include "currency_config.h"
+#include "currency_core/currency_config.h"
 #include "difficulty.h"
 #include "profile_tools.h"
 
diff --git a/src/currency_core/tx_pool.cpp b/src/currency_core/tx_pool.cpp
index 4619dd54..3c4fe8d3 100644
--- a/src/currency_core/tx_pool.cpp
+++ b/src/currency_core/tx_pool.cpp
@@ -12,7 +12,7 @@
 #include "common/db_backend_selector.h"
 #include "tx_pool.h"
 #include "currency_boost_serialization.h"
-#include "currency_config.h"
+#include "currency_core/currency_config.h"
 #include "blockchain_storage.h"
 #include "common/boost_serialization_helper.h"
 #include "common/int-util.h"
diff --git a/src/gui/gui_utils.cpp b/src/gui/gui_utils.cpp
index 5e922e6d..e22b434e 100644
--- a/src/gui/gui_utils.cpp
+++ b/src/gui/gui_utils.cpp
@@ -28,7 +28,7 @@
 // #endif
 #include <stdint.h>
 #include <math.h>
-#include "currency_config.h"
+#include "currency_core/currency_config.h"
 #define GUI_LINK_NAME "Lethean"
 
 #ifdef WIN32
diff --git a/src/p2p/net_node.h b/src/p2p/net_node.h
index e372aad3..ec739642 100644
--- a/src/p2p/net_node.h
+++ b/src/p2p/net_node.h
@@ -27,7 +27,7 @@
 #include "math_helper.h"
 #include "net_node_common.h"
 #include "maintainers_info_boost_serialization.h"
-#include "currency_config.h"
+#include "currency_core/currency_config.h"
 using namespace epee;
 
 #undef LOG_DEFAULT_CHANNEL
diff --git a/src/p2p/net_peerlist.h b/src/p2p/net_peerlist.h
index 0fcb5791..287bb387 100644
--- a/src/p2p/net_peerlist.h
+++ b/src/p2p/net_peerlist.h
@@ -24,7 +24,7 @@
 #include "syncobj.h"
 #include "net/local_ip.h"
 #include "p2p_protocol_defs.h"
-#include "currency_config.h"
+#include "currency_core/currency_config.h"
 #include "net_peerlist_boost_serialization.h"
 #include "common/boost_serialization_helper.h"
 
diff --git a/src/p2p/p2p_protocol_defs.h b/src/p2p/p2p_protocol_defs.h
index f8cf2923..f8d184e7 100644
--- a/src/p2p/p2p_protocol_defs.h
+++ b/src/p2p/p2p_protocol_defs.h
@@ -9,7 +9,7 @@
 #include <boost/uuid/uuid.hpp>
 #include "serialization/keyvalue_serialization.h"
 #include "misc_language.h"
-#include "currency_config.h"
+#include "currency_core/currency_config.h"
 #include "crypto/crypto.h"
 
 namespace nodetool
diff --git a/src/stratum/stratum_server.cpp b/src/stratum/stratum_server.cpp
index e561105f..d615bf51 100644
--- a/src/stratum/stratum_server.cpp
+++ b/src/stratum/stratum_server.cpp
@@ -6,7 +6,7 @@
 #include "stratum_server.h"
 #include "stratum_helpers.h"
 #include "net/abstract_tcp_server2.h"
-#include "currency_config.h"
+#include "currency_core/currency_config.h"
 #include "currency_core/currency_core.h"
 #include "common/command_line.h"
 #include "common/int-util.h"
diff --git a/src/wallet/plain_wallet_api.cpp b/src/wallet/plain_wallet_api.cpp
index 8151fcfe..d1d9ff1f 100644
--- a/src/wallet/plain_wallet_api.cpp
+++ b/src/wallet/plain_wallet_api.cpp
@@ -8,7 +8,7 @@
 #endif
 #include "plain_wallet_api.h"
 #include "plain_wallet_api_defs.h"
-#include "currency_config.h"
+#include "currency_core/currency_config.h"
 #include "version.h"
 #include "string_tools.h"
 #include "currency_core/currency_format_utils.h"