diff --git a/GPy/models/bayesian_gplvm.py b/GPy/models/bayesian_gplvm.py
index fca97e96..7cbd69eb 100644
--- a/GPy/models/bayesian_gplvm.py
+++ b/GPy/models/bayesian_gplvm.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012, GPy authors (see AUTHORS.txt).
+# Copyright (c) 2012 - 2014 the GPy Austhors (see AUTHORS.txt)
 # Licensed under the BSD 3-clause license (see LICENSE.txt)
 
 import numpy as np
diff --git a/GPy/models/bayesian_gplvm_minibatch.py b/GPy/models/bayesian_gplvm_minibatch.py
index 80abba59..f164b466 100644
--- a/GPy/models/bayesian_gplvm_minibatch.py
+++ b/GPy/models/bayesian_gplvm_minibatch.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012, GPy authors (see AUTHORS.txt).
+# Copyright (c) 2012-2014, GPy authors (see AUTHORS.txt).
 # Licensed under the BSD 3-clause license (see LICENSE.txt)
 
 import numpy as np
diff --git a/GPy/models/bcgplvm.py b/GPy/models/bcgplvm.py
index c54ffdf6..899bb2f8 100644
--- a/GPy/models/bcgplvm.py
+++ b/GPy/models/bcgplvm.py
@@ -1,4 +1,4 @@
-# ## Copyright (c) 2012, GPy authors (see AUTHORS.txt).
+# Copyright (c) 2012-2014, GPy authors (see AUTHORS.txt).
 # Licensed under the BSD 3-clause license (see LICENSE.txt)
 
 
diff --git a/GPy/models/gp_classification.py b/GPy/models/gp_classification.py
index 188d5e84..bbf4f316 100644
--- a/GPy/models/gp_classification.py
+++ b/GPy/models/gp_classification.py
@@ -1,4 +1,3 @@
-# Copyright (c) 2013, Ricardo Andrade
 # Copyright (c) 2013, the GPy Authors (see AUTHORS.txt)
 # Licensed under the BSD 3-clause license (see LICENSE.txt)
 
diff --git a/GPy/models/gplvm.py b/GPy/models/gplvm.py
index 9cc361ee..6318829d 100644
--- a/GPy/models/gplvm.py
+++ b/GPy/models/gplvm.py
@@ -1,4 +1,4 @@
-# ## Copyright (c) 2012, GPy authors (see AUTHORS.txt).
+# Copyright (c) 2012-2014, GPy authors (see AUTHORS.txt).
 # Licensed under the BSD 3-clause license (see LICENSE.txt)
 
 
diff --git a/GPy/util/block_matrices.py b/GPy/util/block_matrices.py
index 8fd5f89d..95920868 100644
--- a/GPy/util/block_matrices.py
+++ b/GPy/util/block_matrices.py
@@ -1,3 +1,5 @@
+# Copyright (c) 2012, GPy authors (see AUTHORS.txt).
+# Licensed under the BSD 3-clause license (see LICENSE.txt)
 import numpy as np
 
 def get_blocks(A, blocksizes):
diff --git a/GPy/util/caching.py b/GPy/util/caching.py
index 6e954fc7..16adc320 100644
--- a/GPy/util/caching.py
+++ b/GPy/util/caching.py
@@ -1,3 +1,5 @@
+# Copyright (c) 2012, GPy authors (see AUTHORS.txt).
+# Licensed under the BSD 3-clause license (see LICENSE.txt)
 from ..core.parameterization.observable import Observable
 import collections, weakref
 
diff --git a/GPy/util/classification.py b/GPy/util/classification.py
index 41701949..c0859793 100644
--- a/GPy/util/classification.py
+++ b/GPy/util/classification.py
@@ -1,3 +1,5 @@
+# Copyright (c) 2012, GPy authors (see AUTHORS.txt).
+# Licensed under the BSD 3-clause license (see LICENSE.txt)
 import numpy as np
 
 def conf_matrix(p,labels,names=['1','0'],threshold=.5,show=True):
diff --git a/GPy/util/debug.py b/GPy/util/debug.py
index b676d028..00107f5e 100644
--- a/GPy/util/debug.py
+++ b/GPy/util/debug.py
@@ -10,7 +10,7 @@ import numpy as np
 def checkFinite(arr, name=None):
     if name is None:
         name = 'Array with ID['+str(id(arr))+']'
-        
+
     if np.any(np.logical_not(np.isfinite(arr))):
         idx = np.where(np.logical_not(np.isfinite(arr)))[0]
         print name+' at indices '+str(idx)+' have not finite values: '+str(arr[idx])+'!'
@@ -21,16 +21,15 @@ def checkFullRank(m, tol=1e-10, name=None, force_check=False):
     if name is None:
         name = 'Matrix with ID['+str(id(m))+']'
     assert len(m.shape)==2 and m.shape[0]==m.shape[1], 'The input of checkFullRank has to be a square matrix!'
-    
+
     if not force_check and m.shape[0]>=10000:
         print 'The size of '+name+'is too big to check (>=10000)!'
         return True
-    
+
     s = np.real(np.linalg.eigvals(m))
-    
+
     if s.min()/s.max()<tol:
         print name+' is close to singlar!'
         print 'The eigen values of '+name+' is '+str(s)
         return False
     return True
-    
\ No newline at end of file
diff --git a/GPy/util/decorators.py b/GPy/util/decorators.py
index c8aa08a2..4273442d 100644
--- a/GPy/util/decorators.py
+++ b/GPy/util/decorators.py
@@ -1,3 +1,5 @@
+# Copyright (c) 2012, GPy authors (see AUTHORS.txt).
+# Licensed under the BSD 3-clause license (see LICENSE.txt)
 import numpy as np
 from functools import wraps
 
diff --git a/GPy/util/diag.py b/GPy/util/diag.py
index 3044ed54..e7c332e2 100644
--- a/GPy/util/diag.py
+++ b/GPy/util/diag.py
@@ -1,10 +1,5 @@
-'''
-.. module:: GPy.util.diag
-
-.. moduleauthor:: Max Zwiessele <ibinbei@gmail.com>
-
-'''
-__updated__ = '2013-12-03'
+# Copyright (c) 2012, GPy authors (see AUTHORS.txt).
+# Licensed under the BSD 3-clause license (see LICENSE.txt)
 
 import numpy as np
 
diff --git a/GPy/util/functions.py b/GPy/util/functions.py
index 3278182f..be024aeb 100644
--- a/GPy/util/functions.py
+++ b/GPy/util/functions.py
@@ -1,3 +1,5 @@
+# Copyright (c) 2012, GPy authors (see AUTHORS.txt).
+# Licensed under the BSD 3-clause license (see LICENSE.txt)
 import numpy as np
 from scipy.special import erf, erfc, erfcx
 import sys