diff --git a/Modules/PhotoacousticSimulation/MCxyz/CMakeLists.txt b/Modules/PhotoacousticSimulation/MCxyz/CMakeLists.txt
index c5b601ab7b..71e6c6e748 100644
--- a/Modules/PhotoacousticSimulation/MCxyz/CMakeLists.txt
+++ b/Modules/PhotoacousticSimulation/MCxyz/CMakeLists.txt
@@ -1,9 +1,11 @@
 OPTION(BUILD_PhotoacousticSimulationMCxyz "Build MiniApp for Photoacoustic Simulation Module (mcxyz)" ON)
 
 IF(BUILD_PhotoacousticSimulationMCxyz)
   PROJECT( MCxyz )
     mitk_create_executable(MCxyz
       DEPENDS MitkCommandLine MitkCore MitkPhotoacousticSimulation
       PACKAGE_DEPENDS
       CPP_FILES mitkMCxyz.cpp)
+
+  install(TARGETS ${EXECUTABLE_TARGET} RUNTIME DESTINATION bin)
  ENDIF()
diff --git a/Modules/PhotoacousticSimulation/src/Utils/mitkPhotoacousticPropertyCalculator.cpp b/Modules/PhotoacousticSimulation/src/Utils/mitkPhotoacousticPropertyCalculator.cpp
index 91328ca2fb..789cbecba9 100644
--- a/Modules/PhotoacousticSimulation/src/Utils/mitkPhotoacousticPropertyCalculator.cpp
+++ b/Modules/PhotoacousticSimulation/src/Utils/mitkPhotoacousticPropertyCalculator.cpp
@@ -1,135 +1,136 @@
 #include "mitkPhotoacousticPropertyCalculator.h"
 // us
 #include <usModule.h>
 #include <usModuleResource.h>
 #include <usGetModuleContext.h>
 #include <usModuleContext.h>
 #include <usModuleResourceStream.h>
 
 mitk::PhotoacousticPropertyCalculator::Properties mitk::PhotoacousticPropertyCalculator::CalculatePropertyForSpecificWavelength(TissueType tissueType, int wavelength, double bloodOxygen)
 {
   Properties returnValue;
 
   if(!m_Valid)
   {
     mitkThrow() << "PhotoacousticPropertyGenerator was not loaded properly.";
     return returnValue;
   }
 
   double bloodOxygenation = bloodOxygen;
   double bloodVolumeFraction;
   double waterVolumeFraction;
   double fatVolumeFraction;
   double melanosomesVolumeFraction;
   double musp500;
   double fray;
   double bmie;
   double g;
 
   switch (tissueType)
   {
   case AIR:
     returnValue.mua = 0.0001;
     returnValue.mus = 1.0;
     returnValue.g = 1.0;
     return returnValue;
   case BLOOD:
     bloodVolumeFraction = 1.0;
     waterVolumeFraction = 0.95;
     fatVolumeFraction = 0.02;
     melanosomesVolumeFraction = 0;
     musp500 = 10;
     fray = 0;
     bmie = 1;
     g = 0.9;
     break;
   case EPIDERMIS:
     bloodVolumeFraction = 0;
     bloodOxygenation = 0;
     waterVolumeFraction = 0.75;
     fatVolumeFraction = 0.01;
     melanosomesVolumeFraction = 0.02;
     musp500 = 40;
     fray = 0;
     bmie = 1;
     g = 0.9;
     break;
   case FAT:
     bloodVolumeFraction = 0.01;
     bloodOxygenation = 0.75;
     waterVolumeFraction = 0.5;
     fatVolumeFraction = 0.6;
     melanosomesVolumeFraction = 0;
     musp500 = 17.47;
     fray = 0.2;
     bmie = 0.5;
     g = 0.9;
     break;
   case STANDARD_TISSUE:
+  default:
     bloodVolumeFraction = 0.02;
     bloodOxygenation = 0.75;
     waterVolumeFraction = 0.8;
     fatVolumeFraction = 0.05;
     melanosomesVolumeFraction = 0;
     musp500 = 25;
     fray = 0.25;
     bmie = 1;
     g = 0.9;
     break;
   }
 
   // We want the reduced scattering coefficient directly.
   double musp = musp500 * (fray * pow(wavelength / 500.0, - 4.0) + ((1 - fray) * pow(wavelength / 500.0, - bmie)));
   returnValue.mus = musp;
 
   double mua = bloodVolumeFraction*bloodOxygenation*m_SpectralLibMap[MapType::OXYGENATED][wavelength] +
       bloodVolumeFraction*(1-bloodOxygenation)*m_SpectralLibMap[MapType::DEOXYGENATED][wavelength] +
       waterVolumeFraction*m_SpectralLibMap[MapType::WATER][wavelength] +
       fatVolumeFraction*m_SpectralLibMap[MapType::FATTY][wavelength] +
       melanosomesVolumeFraction*m_SpectralLibMap[MapType::MELANIN][wavelength];
 
   returnValue.mua = mua;
 
   returnValue.g = g;
 
   return returnValue;
 }
 
 mitk::PhotoacousticPropertyCalculator::PhotoacousticPropertyCalculator()
 {
   us::ModuleResource resource = us::GetModuleContext()->GetModule()->GetResource("spectralLIB.dat");
 
   if (resource.IsValid())
   {
     us::ModuleResourceStream resourceStream(resource);
     std::string line;
     int wavelength=300;
     int counter = 0;
     while (std::getline(resourceStream, line, '\t'))
     {
       int currentLineIdx = counter%6;
       if(currentLineIdx==0)
         wavelength = std::stoi(line);
       else
       {
         std::istringstream lineStream(line);
         double tempDouble;
         lineStream >> tempDouble;
         m_SpectralLibMap[currentLineIdx][wavelength] = tempDouble;
       }
       ++counter;
     }
   }
   else
   {
     m_Valid = false;
   }
 
   m_Valid = true;
 }
 
 mitk::PhotoacousticPropertyCalculator::~PhotoacousticPropertyCalculator()
 {
   m_SpectralLibMap.clear();
   m_Valid = false;
 }