diff --git a/Porthos/makefile b/Porthos/makefile
index b497edcdc14b79c25e322f342698bba2b227b6bb..e6290aed56c0e9f41cec836ee2c660c9a55d0f42 100644
--- a/Porthos/makefile
+++ b/Porthos/makefile
@@ -1,4 +1,3 @@
-
 CXX=g++
 SRC_CPP_FILES     := $(wildcard src/*.cpp)
 EX_NN_CPP_FILES	  := $(wildcard src/example_neural_nets/*.cpp)
diff --git a/Porthos/setup-eigen.sh b/Porthos/setup-eigen.sh
index cff52aceb08e2261fc3425332d1342334e700892..8c69bf5a88706becd41adcc23459214da0d987d7 100755
--- a/Porthos/setup-eigen.sh
+++ b/Porthos/setup-eigen.sh
@@ -1,3 +1,23 @@
+# Authors: Mayank Rathee.
+
+# Copyright:
+# Copyright (c) 2018 Microsoft Research
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
 #!/bin/sh
 
 #Get stable Eigen 3.3.7
diff --git a/Porthos/src/AESObject.cpp b/Porthos/src/AESObject.cpp
index ce0fc1a28c0c9ea916ccf0510705ca42baed03a9..d15b6f7b10b4887ade1daf8f1c2ee4b1034ec18a 100644
--- a/Porthos/src/AESObject.cpp
+++ b/Porthos/src/AESObject.cpp
@@ -1,6 +1,6 @@
 /*
 
-Authors: Mayank Rathee, Nishant Kumar.
+Authors: Sameer Wagh, Mayank Rathee, Nishant Kumar.
 
 Copyright:
 Copyright (c) 2018 Microsoft Research
diff --git a/Porthos/src/AESObject.h b/Porthos/src/AESObject.h
index ff8707fe3fc58694935ec4418708af0510685d82..3eb43ae6d7158a86b95f6b35b93129702fe88da4 100644
--- a/Porthos/src/AESObject.h
+++ b/Porthos/src/AESObject.h
@@ -1,6 +1,6 @@
 /*
 
-Authors: Mayank Rathee, Nishant Kumar.
+Authors: Sameer Wagh, Mayank Rathee, Nishant Kumar.
 
 Copyright:
 Copyright (c) 2018 Microsoft Research
diff --git a/Porthos/src/EzPCFunctionalities.cpp b/Porthos/src/EzPCFunctionalities.cpp
index e92d98bd75e9358207c7aa48272a516217700ee8..af69154dfb2e527d65e0d9e20b0ffab03315e7bc 100644
--- a/Porthos/src/EzPCFunctionalities.cpp
+++ b/Porthos/src/EzPCFunctionalities.cpp
@@ -1,6 +1,6 @@
 /*
 
-Authors: Mayank Rathee, Nishant Kumar.
+Authors: Nishant Kumar, Mayank Rathee.
 
 Copyright:
 Copyright (c) 2018 Microsoft Research
diff --git a/Porthos/src/EzPCFunctionalities.h b/Porthos/src/EzPCFunctionalities.h
index 75acda500bfcd9cc27727948d5a7733c74899c4e..8c0e085b8aa6d1479106363a45d72752f90fe4d6 100644
--- a/Porthos/src/EzPCFunctionalities.h
+++ b/Porthos/src/EzPCFunctionalities.h
@@ -1,6 +1,6 @@
 /*
 
-Authors: Mayank Rathee, Nishant Kumar.
+Authors: Nishant Kumar, Mayank Rathee.
 
 Copyright:
 Copyright (c) 2018 Microsoft Research
diff --git a/Porthos/src/Functionalities.cpp b/Porthos/src/Functionalities.cpp
index 2bae3740c8140bc4c0d179294e1f7ff8b668a56a..97a02cd66d85d80950c67bd8337aa03240d82880 100644
--- a/Porthos/src/Functionalities.cpp
+++ b/Porthos/src/Functionalities.cpp
@@ -1,6 +1,6 @@
 /*
 
-Authors: Mayank Rathee, Nishant Kumar.
+Authors: Sameer Wagh, Mayank Rathee, Nishant Kumar.
 
 Copyright:
 Copyright (c) 2018 Microsoft Research
diff --git a/Porthos/src/Functionalities.h b/Porthos/src/Functionalities.h
index 256a17385ebd2bee6793e87cfebfc9cece5dc8eb..a43970b42c19dbd91ac29f24dfa7b63a38b192ce 100644
--- a/Porthos/src/Functionalities.h
+++ b/Porthos/src/Functionalities.h
@@ -1,6 +1,6 @@
 /*
 
-Authors: Mayank Rathee, Nishant Kumar.
+Authors: Sameer Wagh, Mayank Rathee, Nishant Kumar.
 
 Copyright:
 Copyright (c) 2018 Microsoft Research
diff --git a/Porthos/src/ParallelAESObject.cpp b/Porthos/src/ParallelAESObject.cpp
index 46db1bd3f8b902bc94913431160fabb09b888b95..aad643dceb266a438c7f7913b1195194a384ad50 100644
--- a/Porthos/src/ParallelAESObject.cpp
+++ b/Porthos/src/ParallelAESObject.cpp
@@ -1,6 +1,6 @@
 /*
 
-Authors: Mayank Rathee, Nishant Kumar.
+Authors: Sameer Wagh, Mayank Rathee, Nishant Kumar.
 
 Copyright:
 Copyright (c) 2018 Microsoft Research
diff --git a/Porthos/src/ParallelAESObject.h b/Porthos/src/ParallelAESObject.h
index 6d9abb01f2ef9653c876c0546cc81bcc2c216711..2cd2cfa282b8de1b285617c14c8d57b5fdb1cd2b 100644
--- a/Porthos/src/ParallelAESObject.h
+++ b/Porthos/src/ParallelAESObject.h
@@ -1,6 +1,6 @@
 /*
 
-Authors: Mayank Rathee, Nishant Kumar.
+Authors: Sameer Wagh, Mayank Rathee, Nishant Kumar.
 
 Copyright:
 Copyright (c) 2018 Microsoft Research
diff --git a/Porthos/src/connect.cpp b/Porthos/src/connect.cpp
index 5a848e442fd285d6a480498b67affd90849ef937..7828337f8be0a0deb40c824f3ac0278e833be9d6 100644
--- a/Porthos/src/connect.cpp
+++ b/Porthos/src/connect.cpp
@@ -1,6 +1,6 @@
 /*
 
-Authors: Mayank Rathee, Nishant Kumar.
+Authors: Sameer Wagh, Mayank Rathee, Nishant Kumar.
 
 Copyright:
 Copyright (c) 2018 Microsoft Research
diff --git a/Porthos/src/connect.h b/Porthos/src/connect.h
index ab450db54c84c1a4a2799ce6c66533a0ea412107..0ee1f6aaf460183e68269f3e98ba75900adff371 100644
--- a/Porthos/src/connect.h
+++ b/Porthos/src/connect.h
@@ -1,6 +1,6 @@
 /*
 
-Authors: Mayank Rathee, Nishant Kumar.
+Authors: Sameer Wagh, Mayank Rathee, Nishant Kumar.
 
 Copyright:
 Copyright (c) 2018 Microsoft Research
diff --git a/Porthos/src/globals.h b/Porthos/src/globals.h
index 12e8d13d43e0ef5b3e2eb1edd117501dcb4db237..a96bccb4ffe10940f8260718e0be7d33db4da12e 100644
--- a/Porthos/src/globals.h
+++ b/Porthos/src/globals.h
@@ -1,6 +1,6 @@
 /*
 
-Authors: Mayank Rathee, Nishant Kumar.
+Authors: Sameer Wagh, Mayank Rathee, Nishant Kumar.
 
 Copyright:
 Copyright (c) 2018 Microsoft Research
diff --git a/Porthos/src/secondary.cpp b/Porthos/src/secondary.cpp
index 29b66363242df8cec0ef75e6226b4e260f34eece..bfd23ea435aef5bd6804b492285f214a3bb25d04 100644
--- a/Porthos/src/secondary.cpp
+++ b/Porthos/src/secondary.cpp
@@ -1,6 +1,6 @@
 /*
 
-Authors: Mayank Rathee, Nishant Kumar.
+Authors: Sameer Wagh, Mayank Rathee, Nishant Kumar.
 
 Copyright:
 Copyright (c) 2018 Microsoft Research
diff --git a/Porthos/src/secondary.h b/Porthos/src/secondary.h
index 8d839d83288ce6f170e7ce5e478acf40b8b4d1e7..b7779424394edcd0706151ac67610be4988cc4b6 100644
--- a/Porthos/src/secondary.h
+++ b/Porthos/src/secondary.h
@@ -1,6 +1,6 @@
 /*
 
-Authors: Mayank Rathee, Nishant Kumar.
+Authors: Sameer Wagh, Mayank Rathee, Nishant Kumar.
 
 Copyright:
 Copyright (c) 2018 Microsoft Research
diff --git a/Porthos/util/TedKrovetzAesNiWrapperC.cpp b/Porthos/util/TedKrovetzAesNiWrapperC.cpp
index c2a041a22bf1cd3f74f369d90c321cfea9e72a98..6ebb6dfd948b03edf3b68126e7ca55f85a4d2dfe 100644
--- a/Porthos/util/TedKrovetzAesNiWrapperC.cpp
+++ b/Porthos/util/TedKrovetzAesNiWrapperC.cpp
@@ -1,3 +1,17 @@
+/**
+* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+*
+* Copyright(c) 2013 Ted Krovetz.
+* This file is part of the SCAPI project, is was taken from the file ocb.c written by Ted Krovetz.
+* Some changes and additions have been made and only part of the file written by Ted Krovetz has been copied 
+* only for the use of this project.
+*
+* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+*
+*/
+
+// Copyright(c) 2013 Ted Krovetz.
+
 #include "TedKrovetzAesNiWrapperC.h"
 #include <iostream>
 #include <cstring>