diff --git a/FDTD/extensions/operator_ext_conductingsheet.h b/FDTD/extensions/operator_ext_conductingsheet.h
index 9bd5200..9a7d12d 100644
--- a/FDTD/extensions/operator_ext_conductingsheet.h
+++ b/FDTD/extensions/operator_ext_conductingsheet.h
@@ -36,7 +36,7 @@ public:
 
 	virtual bool BuildExtension();
 
-	virtual bool IsCylinderCoordsSave(bool closedAlpha, bool R0_included) const {return true;}
+	virtual bool IsCylinderCoordsSave(bool closedAlpha, bool R0_included) const {UNUSED(closedAlpha); UNUSED(R0_included); return true;}
 	virtual bool IsCylindricalMultiGridSave(bool child) const {UNUSED(child); return true;}
 
 	virtual string GetExtensionName() const {return string("Conducting Sheet Extension");}
diff --git a/FDTD/extensions/operator_ext_cylinder.h b/FDTD/extensions/operator_ext_cylinder.h
index c47a6bf..6ec07ff 100644
--- a/FDTD/extensions/operator_ext_cylinder.h
+++ b/FDTD/extensions/operator_ext_cylinder.h
@@ -35,7 +35,7 @@ public:
 
 	virtual Engine_Extension* CreateEngineExtention();
 
-	virtual bool IsCylinderCoordsSave(bool closedAlpha, bool R0_included) const {return true;}
+	virtual bool IsCylinderCoordsSave(bool closedAlpha, bool R0_included) const {UNUSED(closedAlpha); UNUSED(R0_included); return true;}
 	virtual bool IsCylindricalMultiGridSave(bool child) const {UNUSED(child); return true;}
 
 	virtual std::string GetExtensionName() const {return std::string("Extension for the Cylinder-Coords Operator");}
diff --git a/FDTD/extensions/operator_ext_excitation.h b/FDTD/extensions/operator_ext_excitation.h
index 2cfb5f3..721def1 100644
--- a/FDTD/extensions/operator_ext_excitation.h
+++ b/FDTD/extensions/operator_ext_excitation.h
@@ -36,7 +36,7 @@ public:
 
 	virtual Engine_Extension* CreateEngineExtention();
 
-	virtual bool IsCylinderCoordsSave(bool closedAlpha, bool R0_included) const {return true;}
+	virtual bool IsCylinderCoordsSave(bool closedAlpha, bool R0_included) const {UNUSED(closedAlpha); UNUSED(R0_included); return true;}
 	virtual bool IsCylindricalMultiGridSave(bool child) const {UNUSED(child); return true;}
 
 	virtual string GetExtensionName() const {return string("Excitation Extension");}
diff --git a/FDTD/extensions/operator_ext_lorentzmaterial.h b/FDTD/extensions/operator_ext_lorentzmaterial.h
index a77a648..37d9b1a 100644
--- a/FDTD/extensions/operator_ext_lorentzmaterial.h
+++ b/FDTD/extensions/operator_ext_lorentzmaterial.h
@@ -34,7 +34,7 @@ public:
 
 	virtual Engine_Extension* CreateEngineExtention();
 
-	virtual bool IsCylinderCoordsSave(bool closedAlpha, bool R0_included) const {return true;}
+	virtual bool IsCylinderCoordsSave(bool closedAlpha, bool R0_included) const {UNUSED(closedAlpha); UNUSED(R0_included); return true;}
 	virtual bool IsCylindricalMultiGridSave(bool child) const {UNUSED(child); return true;}
 
 	virtual string GetExtensionName() const {return string("Drude/Lorentz Dispersive Material Extension");}
diff --git a/FDTD/extensions/operator_ext_pml_sf.cpp b/FDTD/extensions/operator_ext_pml_sf.cpp
index af0d7b4..d714b5b 100644
--- a/FDTD/extensions/operator_ext_pml_sf.cpp
+++ b/FDTD/extensions/operator_ext_pml_sf.cpp
@@ -398,6 +398,9 @@ Engine_Extension* Operator_Ext_PML_SF_Plane::CreateEngineExtention()
 
 bool Operator_Ext_PML_SF_Plane::IsCylinderCoordsSave(bool closedAlpha, bool R0_included)  const
 {
+	UNUSED(closedAlpha);
+	UNUSED(R0_included);
+
 	if (m_ny==2)
 	{
 		Operator_Cylinder* op_cyl = dynamic_cast<Operator_Cylinder*>(m_Op);
diff --git a/FDTD/extensions/operator_ext_upml.h b/FDTD/extensions/operator_ext_upml.h
index e39cb82..d865408 100644
--- a/FDTD/extensions/operator_ext_upml.h
+++ b/FDTD/extensions/operator_ext_upml.h
@@ -36,7 +36,7 @@ public:
 	virtual ~Operator_Ext_UPML();
 
 	//! Returns always true, Create_UPML method will take care of creating a valid pml for the cylindrical fdtd
-	virtual bool IsCylinderCoordsSave(bool closedAlpha, bool R0_included) const {return true;}
+	virtual bool IsCylinderCoordsSave(bool closedAlpha, bool R0_included) const { UNUSED(closedAlpha); UNUSED(R0_included); return true;}
 
 	//! Returns always true if base grid, Create_UPML will create proper child pml extensions.
 	virtual bool IsCylindricalMultiGridSave(bool child) const {if (child) return false; return true;}
diff --git a/FDTD/extensions/operator_extension.h b/FDTD/extensions/operator_extension.h
index 5e5b7ca..27ade51 100644
--- a/FDTD/extensions/operator_extension.h
+++ b/FDTD/extensions/operator_extension.h
@@ -44,14 +44,14 @@ public:
 		Create a clone of this extension, will return NULL if this is impossible (e.g. derived extension has no clone method and copy-constructor)...
 		BuildExtension has to be called separatly!
 	*/
-	virtual Operator_Extension* Clone(Operator* op) {return NULL;}
+	virtual Operator_Extension* Clone(Operator* op) {UNUSED(op); return NULL;}
 
 	virtual bool BuildExtension() {return true;}
 
 	virtual Engine_Extension* CreateEngineExtention() {return 0;}
 
 	//! The cylindrical operator will check whether the extension is save to use. Default is false. Derive this method to override.
-	virtual bool IsCylinderCoordsSave(bool closedAlpha, bool R0_included) const {return false;}
+	virtual bool IsCylinderCoordsSave(bool closedAlpha, bool R0_included) const {UNUSED(closedAlpha); UNUSED(R0_included); return false;}
 
 	//! The cylindrical multi grid operator will check whether the extension is save to use. Default is false. Derive this method to override.
 	virtual bool IsCylindricalMultiGridSave(bool child) const {UNUSED(child); return false;}
diff --git a/main.cpp b/main.cpp
index da7eb22..5b5b0b3 100644
--- a/main.cpp
+++ b/main.cpp
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
 	openEMS FDTD;
 #endif
 
-#ifdef _LP64 || _WIN64
+#if defined(_LP64) || defined(_WIN64)
 	string bits = "64bit";
 #else
 	string bits = "32bit";
diff --git a/openEMS.pro b/openEMS.pro
index 144b26e..97b0632 100644
--- a/openEMS.pro
+++ b/openEMS.pro
@@ -6,8 +6,7 @@ CONFIG -= app_bundle qt
 TEMPLATE = app
 OBJECTS_DIR = obj
 INCLUDEPATH += .
-INCLUDEPATH += ../CSXCAD \
-    ../fparser
+INCLUDEPATH += ../CSXCAD ../fparser
 CONFIG += debug_and_release
 
 
@@ -51,8 +50,8 @@ win32 {
     # vtk
     INCLUDEPATH +=   $$WIN32_LIB_ROOT/vtk \
         $$WIN32_LIB_ROOT/vtk/Common \
-		$$WIN32_LIB_ROOT/vtk/Filtering \
-		$$WIN32_LIB_ROOT/vtk/IO
+        $$WIN32_LIB_ROOT/vtk/Filtering \
+        $$WIN32_LIB_ROOT/vtk/IO
      LIBS += -L$$WIN32_LIB_ROOT/vtk/bin -lvtkCommon -lvtkIO -lvtkFiltering
 }
 !win32 {
@@ -61,7 +60,7 @@ win32 {
     LIBS += -L../CSXCAD -lCSXCAD
     LIBS += -lboost_thread-mt
     LIBS += -lhdf5 -lhdf5_cpp
-	### vtk ###
+    ### vtk ###
     INCLUDEPATH += /usr/include/vtk-5.2 \
         /usr/include/vtk-5.4 \
         /usr/include/vtk-5.6 \
@@ -71,11 +70,14 @@ win32 {
     INCLUDEPATH += /usr/include/CSXCAD
     LIBS += -lvtkCommon \
         -lvtkIO \
-		-lvtksys \
-		-lvtkFiltering
+        -lvtksys \
+        -lvtkFiltering
+    QMAKE_LFLAGS += \'-Wl,-rpath,\$$ORIGIN/../CSXCAD\'
+    QMAKE_LFLAGS += \'-Wl,-rpath,\$$ORIGIN/../fparser\'
 }
-QMAKE_LFLAGS += \'-Wl,-rpath,\$$ORIGIN/../CSXCAD\'
-QMAKE_LFLAGS += \'-Wl,-rpath,\$$ORIGIN/../fparser\'
+
+# vtk includes deprecated header files; silence the corresponding warning
+QMAKE_CXXFLAGS += -Wno-deprecated
 
 # hdf5 compat
 DEFINES += H5_USE_16_API
@@ -99,9 +101,9 @@ SOURCES += FDTD/engine.cpp \
     FDTD/excitation.cpp \
     FDTD/operator_cylindermultigrid.cpp \
     FDTD/engine_cylindermultigrid.cpp \
-	FDTD/engine_interface_fdtd.cpp \
-	FDTD/engine_interface_sse_fdtd.cpp \
-	FDTD/engine_interface_cylindrical_fdtd.cpp
+    FDTD/engine_interface_fdtd.cpp \
+    FDTD/engine_interface_sse_fdtd.cpp \
+    FDTD/engine_interface_cylindrical_fdtd.cpp
 
 # FDTD/extensions source files
 SOURCES += FDTD/extensions/engine_extension.cpp \
@@ -138,13 +140,13 @@ SOURCES += Common/operator_base.cpp \
     Common/processfields_sar.cpp
 
 # tools
- SOURCES += tools/global.cpp \
-	tools/useful.cpp \
-	tools/array_ops.cpp \
-	tools/ErrorMsg.cpp \
-	tools/AdrOp.cpp \
-	tools/vtk_file_writer.cpp \
-	tools/hdf5_file_writer.cpp
+SOURCES += tools/global.cpp \
+    tools/useful.cpp \
+    tools/array_ops.cpp \
+    tools/ErrorMsg.cpp \
+    tools/AdrOp.cpp \
+    tools/vtk_file_writer.cpp \
+    tools/hdf5_file_writer.cpp
 
 #### HEADERS ################################################################
 HEADERS += openems.h
@@ -204,24 +206,20 @@ HEADERS += Common/operator_base.h \
 
 # tools
 HEADERS += tools/ErrorMsg.h \
-	tools/AdrOp.h \
-	tools/constants.h \
-	tools/array_ops.h \
-	tools/global.h \
-	tools/useful.h \
-	tools/aligned_allocator.h \
-	tools/vtk_file_writer.h \
-	tools/hdf5_file_writer.h
+    tools/AdrOp.h \
+    tools/constants.h \
+    tools/array_ops.h \
+    tools/global.h \
+    tools/useful.h \
+    tools/aligned_allocator.h \
+    tools/vtk_file_writer.h \
+    tools/hdf5_file_writer.h
 
 !packaging {
-# if packaging is not set in CONFIG, set some default flags
-# if packaging is enabled, give the flags on the qmake comandline
-QMAKE_CXXFLAGS_RELEASE = -O3 \
-	-g \
-	-march=native
-QMAKE_CXXFLAGS_DEBUG = -O0 \
-	-g \
-	-march=native
+    # if packaging is not set in CONFIG, set some default flags
+    # if packaging is enabled, give the flags on the qmake comandline
+    QMAKE_CXXFLAGS_RELEASE = -O3 -g -march=native
+    QMAKE_CXXFLAGS_DEBUG = -O0 -g -march=native
 }
 
 MPI_SUPPORT {