diff --git a/LICENSE.rst b/LICENSE.rst
new file mode 100644
index 0000000000000000000000000000000000000000..2b01e1a463dfd69acf6814235c8a8c66033125ab
--- /dev/null
+++ b/LICENSE.rst
@@ -0,0 +1,28 @@
+=============
+Poisson Solver license
+=============
+
+Copyright 2018 A. Lacerda-Santos (CEA), P. Armagnat (CEA), C. W. Groth (CEA), X. Waintal (CEA). All rights reserved.
+
+(CEA = Commissariat à l'énergie atomique et aux énergies alternatives)
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/poisson/discrete/_discrete_poisson.pyx b/poisson/discrete/_discrete_poisson.pyx
index 75c494bdaf3d6f118727c758ffc13a1f8ebe6732..e1900a9751e37be07d489af4d4f1b56700ced4d7 100644
--- a/poisson/discrete/_discrete_poisson.pyx
+++ b/poisson/discrete/_discrete_poisson.pyx
@@ -6,7 +6,7 @@ import numpy as np
 cimport numpy as np
 
 cpdef find_non_empty(list list_input,
-                     np.ndarray[np.long_t, ndim=1] index_to_test):
+                     np.ndarray[np.int_t, ndim=1] index_to_test):
 
     cdef int position
     cdef long indice
diff --git a/setup.py b/setup.py
index ebc2623d61d3790770bcc83c548f6483e7c8e0eb..657276792c195c42a55e52cfb5ae66fab8aa27ce 100644
--- a/setup.py
+++ b/setup.py
@@ -1,37 +1,33 @@
 '''
     Execute with python3 setup.py build_ext --inplace
 '''
-from setuptools import setup as setup_stools
-from setuptools import find_packages
 import sys
+import numpy
+from setuptools import setup, find_packages
+from Cython.Build import cythonize
 
 if sys.version_info < (3, 5):
     print('poisson requires Python 3.5 or above.')
     sys.exit(1)
 
 install_requires = [
-                    'scipy',
-                    'numpy',
-                    'matplotlib',
+    'scipy',
+    'numpy',
+    'matplotlib',
 ]
 
-setup_stools(
-      name='poisson',
-      description='Poisson solver using finite volume',
-      author='Poisson authors',
-      license='BSD',
-      classifiers=[
-          'Development Status :: Pre-alpha',
-          'Programming Language :: Python :: 3.6',],
-      packages=find_packages('.'),
-      install_requires=install_requires,
-)
-
-from distutils.core import setup as setup_cy
-from Cython.Build import cythonize
-import numpy
-
-setup_cy(ext_modules = cythonize(['poisson/discrete/_finite_volume.pyx',
-                               'poisson/discrete/_discrete_poisson.pyx',
-                               'poisson/discrete/_linear_problem.pyx']),
-         include_dirs=[numpy.get_include()])
+setup(
+    name='poisson',
+    description='Poisson solver using finite volume',
+    author='Poisson authors',
+    license='BSD',
+    classifiers=[
+        'Development Status :: Pre-alpha',
+        'Programming Language :: Python :: 3.6',],
+    packages=find_packages('.', exclude='2DEG_chris'),
+    install_requires=install_requires,
+    ext_modules=cythonize(['poisson/discrete/_finite_volume.pyx',
+                           'poisson/discrete/_discrete_poisson.pyx',
+                           'poisson/discrete/_linear_problem.pyx']),
+    include_dirs=[numpy.get_include()]
+)
\ No newline at end of file
diff --git a/todo.txt b/todo.txt
index f874f8440c18e5b797110794f9d4c3624c629389..e57987bff90f64c61fb24815e72ea45f6d670512 100644
--- a/todo.txt
+++ b/todo.txt
@@ -12,3 +12,7 @@
 
 #TODO: Create a finilized version of DiscretePoisson. Use an ABC class for DiscretePoisson with the minimal info sent to the LinearProblem. Then make 2 different classes. One that has functions to make the mesh and al. Another that has the functions to retrieve the info from the first class. 
 
+#TODO: Write whitepaper on new mixed mesher. Start implementing the one using lattice vector.
+
+#TODO: Change how the dielectric constant for dirichlet regions is defined. 
+