diff --git a/TactileCalibration.prm b/TactileCalibration.prm
index 7088fe5..6bee15b 100644
--- a/TactileCalibration.prm
+++ b/TactileCalibration.prm
@@ -8,7 +8,7 @@ Source:Signal%20Properties:DataIOFilter list ChannelNames= 12 Fz Fc1 Fc2 C3 Cz C
 Source:Signal%20Properties:DataIOFilter floatlist SourceChOffset= 12 0 0 0 0 0 0 0 0 0 0 0 0 0 % % // Offset for channels in A/D units
 Source:Signal%20Properties:DataIOFilter floatlist SourceChGain= 12 0.033 0.033 0.033 0.033 0.033 0.033 0.033 0.033 0.033 0.033 0.033 0.033 0.003 % % // gain for each channel (A/D units -> muV)
 Storage:Data%20Location:DataIOFilter string DataDirectory= ./data/ .\data % % // path to top level data directory (directory)
-Storage:Session:DataIOFilter string SubjectName= WT-tacCalib Name % % // subject alias
+Storage:Session:DataIOFilter string SubjectName= tacCalib Name % % // subject alias
 Storage:Session:DataIOFilter string SubjectSession= 001 001 % % // three-digit session number
 Storage:Session:DataIOFilter string SubjectRun= 00 00 % % // two-digit run number
 Storage:Documentation:DataIOFilter string ID_System= % // BCI2000 System Code
diff --git a/TactileCalibrationNested.prm b/TactileCalibrationNested.prm
index 1f48b55..e3ceb1f 100644
--- a/TactileCalibrationNested.prm
+++ b/TactileCalibrationNested.prm
@@ -47,7 +47,7 @@ Application:Speller%20Targets:P3SpellerTask floatlist IconHighlightFactor= 1 0.5
 Application:Speller:P3SpellerTask int FirstActiveMenu= 1 1 1 % // Index of first active menu
 Application:Speller:P3SpellerTask float StatusBarSize= 30 0 0 100 // size of status bar in percent of screen height
 Application:Speller:P3SpellerTask float StatusBarTextHeight= 12 0 0 100 // size of status bar text in percent of screen height
-Application:Speller:P3SpellerTask string TextToSpell= LRFBLRFB // character or string to spell in offline copy mode
+Application:Speller:P3SpellerTask string TextToSpell= JaNeinJaNein // character or string to spell in offline copy mode
 Application:Speller:P3SpellerTask string TextResult= % // user spelling result
 Application:Speller:P3SpellerTask int TestMode= 1 0 0 1 // select targets by clicking on their associated stimuli (0=no, 1=yes) (boolean)
 Application:Speller:P3SpellerTask string DestinationAddress= % // network address for speller output in IP:port format
@@ -67,12 +67,12 @@ Application:Localization:Localization string Language= Default Default % % // La
 Application:Localization:Localization matrix LocalizedStrings= { German } { TIME%20OUT%20!!! Waiting%20to%20start%20... Sleeping--Select%20SLEEP%20twice%20to%20resume Select%20SLEEP%20once%20more%20to%20resume Paused--Select%20PAUSE%20again%20to%20resume } Zeit%20abgelaufen! Warte%20... Angehalten:%20Zweimal%20SLEEP%20fur%20Weiter Angehalten:%20Noch%20einmal%20SLEEP%20fur%20Weiter Angehalten:%20Noch%20einmal%20PAUSE%20fur%20Weiter // Localized user messages
 System string OperatorAddress= 127.0.0.1:4000 
 System:Core%20Connections string ApplicationIP= 141.75.33.117 // (readonly)(noedit)
-System:Core%20Connections string ApplicationPort= 50840 // (readonly)(noedit)
+System:Core%20Connections string ApplicationPort= 52384 // (readonly)(noedit)
 System:Version matrix ApplicationVersion= { Framework Revision Build Config Protocol } 1 3.6%20BETA.5570.5 5570.5,%202016-10-12T19:27:33Z MSVC-17.0.61030.0-AMD64,%20release,%202016-10-16T14:03:14Z,%20user@user-PC USE_DYNAMIC_CRT:OFF%20USE_OPENMP:ON%20USE_PRECOMPILED_HEADERS:ON%20USE_ASSERTS_IN_RELEASE_BUILDS:OFF%20USE_EXTERNAL_QT:OFF%20Qt:5.3.2:C:/BCI2000.x64/build/CMakeFiles/extlib/qt-5.3.2/win32-amd64-msvc2012/bin/qmake.exe 2.3 // Application version information (noedit)(readonly)
 System:Configuration matrix ApplicationFilterChain= 4 { Filter%20Name Position%20String } ConnectorInput 2.9999 P3SpellerTask 3 KeystrokeFilter 3.1 ConnectorOutput 3.9999 // Application filter chain (noedit)(readonly)
 System:Configuration matrix Filters= 12 1 /3/ConnectorInput /3/P3SpellerTask /3/KeystrokeFilter /3/ConnectorOutput /2/SpatialFilter /2/P3TemporalFilter /2/LinearClassifier /1/DataIOFilter /1/gUSBampADC /1/BCI2000FileWriter /1/AlignmentFilter /1/TransmissionFilter // Filter Directory (noedit)(readonly)
-Storage:Data%20Location:DataIOFilter string DataDirectory= ./data/ .\data % % // path to top level data directory (directory)
-Storage:Session:DataIOFilter string SubjectName= WT-tacCalibNested Name % % // subject alias
+Storage:Data%20Location:DataIOFilter string DataDirectory= ./data/ ..\data % % // path to top level data directory (directory)
+Storage:Session:DataIOFilter string SubjectName= tacCalibNested Name % % // subject alias
 Storage:Session:DataIOFilter string SubjectSession= 001 001 % % // three-digit session number
 Storage:Session:DataIOFilter string SubjectRun= 00 00 % % // two-digit run number
 Storage:Documentation:DataIOFilter string ID_System= % // BCI2000 System Code
@@ -80,41 +80,41 @@ Storage:Documentation:DataIOFilter string ID_Amp= % // BCI2000 Amp Code
 Storage:Documentation:DataIOFilter string ID_Montage= % // BCI2000 Cap Montage Code
 Visualize:Timing:DataIOFilter int VisualizeTiming= 0 1 0 1 // visualize system timing (0=no, 1=yes) (boolean)
 Visualize:Source%20Signal:DataIOFilter int VisualizeSource= 1 1 0 1 // visualize raw brain signal (0=no, 1=yes) (boolean)
-Filtering:SpatialFilter int SpatialFilterType= 0 2 0 3 // spatial filter type 0: none, 1: full matrix, 2: sparse matrix, 3: common average reference (CAR) (enumeration)
 Visualize:Source%20Signal:DataIOFilter int VisualizeSourceDecimation= 1 auto % % // decimation factor for raw brain signal
-Filtering:SpatialFilter:SpatialFilter matrix SpatialFilter= 4 4 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 % % // columns represent input channels, rows represent output channels
+Filtering:SpatialFilter int SpatialFilterType= 0 2 0 3 // spatial filter type 0: none, 1: full matrix, 2: sparse matrix, 3: common average reference (CAR) (enumeration)
 Visualize:Source%20Signal:DataIOFilter int VisualizeSourceBufferSize= auto auto % % // number of blocks to aggregate before sending to operator
-Filtering:SpatialFilter:SpatialFilter intlist SpatialFilterCAROutput= 0 // when using CAR filter type: list of output channels, or empty for all channels
+Filtering:SpatialFilter:SpatialFilter matrix SpatialFilter= 4 4 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 % % // columns represent input channels, rows represent output channels
 Visualize:Source%20Signal:DataIOFilter int VisualizeSourceTime= 2s 2s 0 % // how much time in Source visualization
-Filtering:SpatialFilter:SpatialFilter int SpatialFilterMissingChannels= 1 0 0 1 // how to handle missing channels 0: ignore, 1: report error (enumeration)
+Filtering:SpatialFilter:SpatialFilter intlist SpatialFilterCAROutput= 0 // when using CAR filter type: list of output channels, or empty for all channels
 Visualize:Source%20Signal:DataIOFilter int SourceMin= -100muV // raw signal vis Min Value
-Filtering:P3TemporalFilter int EpochLength= 800ms 500ms 0 % // Length of data epoch from stimulus onset
+Filtering:SpatialFilter:SpatialFilter int SpatialFilterMissingChannels= 1 0 0 1 // how to handle missing channels 0: ignore, 1: report error (enumeration)
 Visualize:Source%20Signal:DataIOFilter int SourceMax= 100muV // raw signal vis Max Value
-Filtering:P3TemporalFilter int EpochsToAverage= 10 1 0 % // Number of epochs to average
+Filtering:P3TemporalFilter int EpochLength= 800ms 500ms 0 % // Length of data epoch from stimulus onset
 Source:gUSBampADC int SamplingRate= 512 256Hz % % // the signal sampling rate
-Filtering:P3TemporalFilter int SingleEpochMode= 0 0 0 1 // Report result after each epoch (boolean)
+Filtering:P3TemporalFilter int EpochsToAverage= 10 1 0 % // Number of epochs to average
 Source:gUSBampADC int SampleBlockSize= 8 1 % % // number of samples per block
-Visualize:P3TemporalFilter int VisualizeP3TemporalFiltering= 0 0 0 1 // Visualize averaged epochs (0=no 1=yes) (boolean)
+Filtering:P3TemporalFilter int SingleEpochMode= 0 0 0 1 // Report result after each epoch (boolean)
 Source:gUSBampADC int SourceCh= 12 auto 0 % // number of digitized channels total
-Visualize:P3TemporalFilter int TargetERPChannel= 1 1 % % // Input channel for which to display ERP data
+Visualize:P3TemporalFilter int VisualizeP3TemporalFiltering= 0 0 0 1 // Visualize averaged epochs (0=no 1=yes) (boolean)
 Source:gUSBampADC list SourceChGain= 12 0.033 0.033 0.033 0.033 0.033 0.033 0.033 0.033 0.033 0.033 0.033 0.033 
-Filtering:LinearClassifier matrix Classifier= 2 { input%20channel input%20element%20(bin) output%20channel weight } 1 4 1 1 1 6 2 1 // Linear classification matrix in sparse representation
+Visualize:P3TemporalFilter int TargetERPChannel= 1 1 % % // Input channel for which to display ERP data
 Source:gUSBampADC list SourceChOffset= 12 0 0 0 0 0 0 0 0 0 0 0 0 
+Filtering:LinearClassifier matrix Classifier= 2 { input%20channel input%20element%20(bin) output%20channel weight } 1 4 1 1 1 6 2 1 // Linear classification matrix in sparse representation
 Source:gUSBampADC list ChannelNames= 12 Fz Fc1 Fc2 C3 Cz C4 P3 Pz P4 O1 Oz O2 
 Source:gUSBamp:Acquisition:gUSBampADC int AcquisitionMode= 0 0 0 2 // data acquisition mode:  0: analog signal acquisition, 1: calibration signal, 2: impedance measurement (enumeration)
-System:Core%20Connections string SignalProcessingIP= 141.75.33.117 // (readonly)(noedit)
-System:Core%20Connections string SignalProcessingPort= 50855 // (readonly)(noedit)
 Source:gUSBamp:Acquisition:gUSBampADC int CommonGround= 1 0 0 1 // internally connect GNDs from all blocks:  0: false, 1: true (enumeration)
+System:Core%20Connections string SignalProcessingIP= 141.75.33.117 // (readonly)(noedit)
+System:Core%20Connections string SignalProcessingPort= 52399 // (readonly)(noedit)
 Source:gUSBamp:Acquisition:gUSBampADC int CommonReference= 1 0 0 1 // internally connect Refs from all blocks:  0: false, 1: true (enumeration)
-System:Version matrix SignalProcessingVersion= { Framework Revision Build Config Protocol } 1 3.6%20BETA.5570.5 5570.5,%202016-10-12T19:27:33Z MSVC-17.0.61030.0-AMD64,%20release,%202016-10-16T14:03:14Z,%20user@user-PC USE_DYNAMIC_CRT:OFF%20USE_OPENMP:ON%20USE_PRECOMPILED_HEADERS:ON%20USE_ASSERTS_IN_RELEASE_BUILDS:OFF%20USE_EXTERNAL_QT:OFF 2.3 // SignalProcessing version information (noedit)(readonly)
 Source:gUSBamp:DigitalIO:gUSBampADC int EnableDigitalInput= 0 0 0 1 // enable digital inputs (boolean)
-System:Configuration matrix SignalProcessingFilterChain= 3 { Filter%20Name Position%20String } SpatialFilter 2.A P3TemporalFilter 2.B LinearClassifier 2.C // SignalProcessing filter chain (noedit)(readonly)
+System:Version matrix SignalProcessingVersion= { Framework Revision Build Config Protocol } 1 3.6%20BETA.5570.5 5570.5,%202016-10-12T19:27:33Z MSVC-17.0.61030.0-AMD64,%20release,%202016-10-16T14:03:14Z,%20user@user-PC USE_DYNAMIC_CRT:OFF%20USE_OPENMP:ON%20USE_PRECOMPILED_HEADERS:ON%20USE_ASSERTS_IN_RELEASE_BUILDS:OFF%20USE_EXTERNAL_QT:OFF 2.3 // SignalProcessing version information (noedit)(readonly)
 Source:gUSBamp:DigitalIO:gUSBampADC int EnableDigitalOutput= 0 0 0 2 // enable digital output on block acquisition 0: off, 1: use expressions, 2: timing test (enumeration)
+System:Configuration matrix SignalProcessingFilterChain= 3 { Filter%20Name Position%20String } SpatialFilter 2.A P3TemporalFilter 2.B LinearClassifier 2.C // SignalProcessing filter chain (noedit)(readonly)
 Source:gUSBamp:DigitalIO:gUSBampADC matrix DigitalOutputEx= 1 1 % // Matrix of Expressions for digital output
-Visualize:Processing%20Stages int VisualizeSpatialFilter= 0 0 0 1 // Visualize SpatialFilter output (boolean)
 Source:gUSBamp:Acquisition:gUSBampADC int DetectDataLoss= 0 0 0 1 // use gUSBamp counter mode to detect data loss (boolean)
-Visualize:Processing%20Stages int VisualizeLinearClassifier= 0 0 0 1 // Visualize LinearClassifier output (boolean)
+Visualize:Processing%20Stages int VisualizeSpatialFilter= 0 0 0 1 // Visualize SpatialFilter output (boolean)
 Source:gUSBamp:Acquisition:gUSBampADC int NumBuffers= 2 5 2 % // IO queue length
+Visualize:Processing%20Stages int VisualizeLinearClassifier= 0 0 0 1 // Visualize LinearClassifier output (boolean)
 Source:Buffering:gUSBampADC int SourceBufferSize= 2s 2s % % // size of data acquisition ring buffer (in blocks or seconds)
 Source:gUSBamp:Multiple%20Devices:gUSBampADC list DeviceIDs= 1 auto // list of USBamps to be used (or auto)
 Source:gUSBamp:Multiple%20Devices:gUSBampADC string DeviceIDMaster= auto // deviceID for the device whose SYNC goes to the slaves
@@ -138,10 +138,10 @@ Source:Online%20Processing:TransmissionFilter list TransmitChList= 12 1 2 3 4 5
 System:Protocol:EventLink int EventLink= 1 1 0 1 // Send events from Operator to Source module (boolean)
 Storage:Data%20Location:RunManager string DataFile= $%7bSubjectName%7d$%7bSubjectSession%7d/$%7bSubjectName%7dS$%7bSubjectSession%7dR$%7bSubjectRun%7d.$%7bFileFormat%7d // name of data file relative to DataDirectory
 System:Core%20Connections string SignalSourceIP= 141.75.33.117 // (readonly)(noedit)
-System:Core%20Connections string SignalSourcePort= 50846 // (readonly)(noedit)
+System:Core%20Connections string SignalSourcePort= 52390 // (readonly)(noedit)
 System:Version matrix SignalSourceVersion= { Framework Revision Build Config Protocol } 1 3.6%20BETA.5570.5 5570.5,%202016-10-12T19:27:33Z MSVC-17.0.61030.0-AMD64,%20release,%202016-10-16T14:03:14Z,%20user@user-PC USE_DYNAMIC_CRT:OFF%20USE_OPENMP:ON%20USE_PRECOMPILED_HEADERS:ON%20USE_ASSERTS_IN_RELEASE_BUILDS:OFF%20USE_EXTERNAL_QT:OFF 2.3 // SignalSource version information (noedit)(readonly)
 System:Configuration matrix SignalSourceFilterChain= 8 { Filter%20Name Position%20String } DataIOFilter 0 gUSBampADC 1 NullFileWriter 1 BCI2000FileWriter 1 EDFFileWriter 1 GDFFileWriter 1 AlignmentFilter 1.1 TransmissionFilter 1.2 // SignalSource filter chain (noedit)(readonly)
 Visualize:Processing%20Stages int VisualizeAlignmentFilter= 0 0 0 1 // Visualize AlignmentFilter output (boolean)
 Visualize:Processing%20Stages int VisualizeTransmissionFilter= 0 0 0 1 // Visualize TransmissionFilter output (boolean)
-System:Randomization int RandomSeed= 32417 0 % % // seed for the BCI2000 pseudo random number generator (readonly)
+System:Randomization int RandomSeed= 32436 0 % % // seed for the BCI2000 pseudo random number generator (readonly)
 System:Randomization int RandomizationWarning= 1 1 0 1 // warn if subsequent Runs have identical RandomSeed value (boolean)