diff --git a/raytracing/gaussianbeam.py b/raytracing/gaussianbeam.py
index 77dbfab..03bd73b 100644
--- a/raytracing/gaussianbeam.py
+++ b/raytracing/gaussianbeam.py
@@ -4,20 +4,46 @@ import cmath
 class GaussianBeam(object):
     """A gaussian laser beam using the ABCD formalism for propagation of complex radius of curvature q.
 
-    w is the 1/e beam size in electric field extracted from q
-    R is the radius of curvature (positive means diverging) extracted from q
-    n is index in which the beam is. Necessary to compute beam size.
-    wavelength must be in the same units as z.
+    Parameters
+    ----------
+    q : complex
+        The complex beam parameter (default=None)
+    w : float
+        The 1/e beam size in electric field extracted from q. (default=None)
+    R : float
+        The radius of curvature (positive means diverging) extracted from q. (default=+Inf)
+    n : float
+        The index of refraction in which the beam is. (default=1.0)
+    wavelength : float
+        The wave length of the laser beam. This parameter is necessary to compute the beam size (default=632.8e-6)
+    z : float
+        The axial distance from the waist (default=0)
+
+    Attributes
+    ----------
+    isClipped : bool
+        The formalism of gaussian beams does not consider any apertures: the beam
+        remains gaussian no matter what.  This variable will indicate if the beam
+        diameter was too close to the apertures in the system.
+
+    Notes
+    -----
+    wavelength and z must be in the same units.
     """
 
     def __init__(self, q:complex=None, w:float=None, R:float=float("+Inf"), n:float=1.0, wavelength=632.8e-6, z=0):
         # Gaussian beam matrix formalism
+
         if q is not None:
             self.q = q
-        elif w is not None:
+        if w is not None:
             self.q = 1/( 1.0/R - complex(0,1)*wavelength/n/(math.pi*w*w))
-        else:
-            self.q = None 
+        if q is None and w is None:
+            raise ValueError("Please specify 'q' or 'w'.")
+
+        if q is not None and w is not None:
+            if not cmath.isclose(a=self.q, b=q, abs_tol=0.1):
+                raise ValueError("Mismatch between the given q and the computed q (10% tolerance).")
 
         self.wavelength = wavelength
         
@@ -28,6 +54,9 @@ class GaussianBeam(object):
 
     @property
     def R(self):
+        """
+        The radius of curvature (positive means diverging) extracted from q.
+        """
         invQReal = (1/self.q).real
         if invQReal == 0:
             return float("+Inf")
@@ -36,10 +65,20 @@ class GaussianBeam(object):
 
     @property
     def isFinite(self):
+        """
+        Using the complex radius, the imaginary part of -1/q is the beam size.
+        If this value is negative, the calculation will yield a exp(x**2/w**2)
+        which grows exponentially instead of being a gaussian.  Hence, this
+        is not a finite and reasonable complex radius.  This is used for
+        resonator and cavity calculations to discard unphysical solutions.
+        """
         return (-1/self.q).imag > 0
     
     @property
     def w(self):
+        """
+        The 1/e beam size in electric field extracted from q.
+        """
         qInv = (-1/self.q).imag
         if qInv > 0:
             return math.sqrt( self.wavelength/self.n/(math.pi * qInv))
@@ -48,6 +87,9 @@ class GaussianBeam(object):
 
     @property
     def wo(self):
+        """
+        The 1/e beam size in electric field extracted from q at the waist of the beam.
+        """
         if self.zo > 0:
             return math.sqrt( self.zo * self.wavelength/math.pi )
         else:
@@ -55,22 +97,35 @@ class GaussianBeam(object):
 
     @property
     def waist(self):
+        """
+        The same as the wo.
+        """
         return self.wo
 
     @property
     def waistPosition(self):
+        """The position of the waist of the beam."""
         return -self.q.real
 
     @property
     def zo(self):
+        """
+        The same as rayleighRange.
+        """
         return float(self.q.imag)
 
     @property
     def confocalParameter(self):
+        """
+        The same as rayleighRange.
+        """
         return self.zo
 
     @property
     def rayleighRange(self):
+        """
+        Returns the rayleigh range of the beam.
+        """
         return self.zo
 
     def __str__(self):

diff --git a/raytracing/tests/testsGaussian.py b/raytracing/tests/testsGaussian.py
index 8c26cff..be32f22 100644
--- a/raytracing/tests/testsGaussian.py
+++ b/raytracing/tests/testsGaussian.py
@@ -6,7 +6,6 @@ inf = float("+inf")
 
 class TestBeam(unittest.TestCase):
     def testBeam(self):
-        beam = GaussianBeam()
         beam = GaussianBeam(w=1)
         self.assertEqual(beam.w, 1)
         self.assertEqual(beam.R, float("+Inf"))
@@ -19,10 +18,13 @@ class TestBeam(unittest.TestCase):
 
     def testInvalidParameters(self):
         with self.assertRaises(Exception) as context:
-	        beam = GaussianBeam(w=1,R=0)
+            beam = GaussianBeam()
+
+        with self.assertRaises(Exception) as context:
+            beam = GaussianBeam(w=1,R=0)
 
     def testMultiplicationBeam(self):
-    	# No default parameters
+        # No default parameters
         beamIn = GaussianBeam(w=0.01, R=1, n=1.5, wavelength=0.400e-3)
         beamOut = Space(d=0,n=1.5)*beamIn
         self.assertEqual(beamOut.q, beamIn.q)

GaussianBeam: q or w should be specified (not both None)
This can lead to some incoherence: we should check (if q and w are given) that q computed with w is relatively close to q given.

Also, we should not be able to set both as `None`. Having w and q has `None` does nothing good, only lead to issues with methods, because we take for granted that q is a complex number. It doesn't make sense to have a `GaussianBeam` where q and w are `None`.
raytracing/tests/testsGaussian.py::TestBeam::testInvalidParameters
raytracing/tests/testsGaussian.py::TestBeam::testBeam raytracing/tests/testsGaussian.py::TestBeam::testDielectricInterfaceBeam raytracing/tests/testsGaussian.py::TestBeam::testFocalSpot raytracing/tests/testsGaussian.py::TestBeam::testMultiplicationBeam raytracing/tests/testsGaussian.py::TestBeam::testPointBeam raytracing/tests/testsGaussian.py::TestBeam::testPrint raytracing/tests/testsGaussian.py::TestBeam::testWo