diff --git a/extras/src/build/conf/checkstyle.xml b/extras/src/build/conf/checkstyle.xml
index d77f404..6c3ccc0 100644
--- a/extras/src/build/conf/checkstyle.xml
+++ b/extras/src/build/conf/checkstyle.xml
@@ -149,9 +149,11 @@
         </module>
         <module name="IllegalInstantiation"/>
         <module name="InnerAssignment"/>
+        <!-- In 2.0 roll this back out
         <module name="MagicNumber">        	        	
     		<property name="ignoreNumbers" value="0, 0.5, 2, 1, -1" />        	
         </module>
+         -->
         <module name="MissingSwitchDefault"/>
         <module name="RedundantThrows"/>
         <module name="SimplifyBooleanExpression"/>
diff --git a/extras/src/main/java/edu/umd/cs/piccolox/util/PFixedWidthStroke.java b/extras/src/main/java/edu/umd/cs/piccolox/util/PFixedWidthStroke.java
index 6106792..3d42e8f 100644
--- a/extras/src/main/java/edu/umd/cs/piccolox/util/PFixedWidthStroke.java
+++ b/extras/src/main/java/edu/umd/cs/piccolox/util/PFixedWidthStroke.java
@@ -62,6 +62,9 @@
 
     private static final float DEFAULT_MITER_LIMIT = 10.0f;
 
+    private static final BasicStroke DEFAULT_STROKE = new BasicStroke(1.0f, BasicStroke.CAP_SQUARE,
+            BasicStroke.JOIN_MITER, DEFAULT_MITER_LIMIT, null, 0.0f);
+
     private static final long serialVersionUID = 1L;
 
     // avoid repeated cloning:
@@ -71,11 +74,10 @@
     private final transient float[] tmpDash;
 
     /**
-     * Constructs a simple PFixedWidthStroke with thickness 1, square caps, join
-     * meter, and no dashing.
+     * Constructs a simple PFixedWidthStroke with the default stroke.
      */
     public PFixedWidthStroke() {
-        this(1.0f, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_MITER, DEFAULT_MITER_LIMIT, null, 0.0f);
+        this(DEFAULT_STROKE);
     }
 
     /**
@@ -97,20 +99,53 @@
     /**
      * Constructs a simple PFixedWidthStroke with the width provided.
      * 
+     * @deprecated in favor of PFixedWidthStroke(BasicStroke stroke)
+     * 
      * @param width desired width of the stroke
      */
     public PFixedWidthStroke(final float width) {
         this(width, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_MITER, DEFAULT_MITER_LIMIT, null, 0.0f);
     }
 
+    /**
+     * Constructs a PFixedWidthStroke with the stroke properties provided.
+     * 
+     * @deprecated in favor of PFixedWidthStroke(BasicStroke stroke)
+     * 
+     * @param width width of stroke
+     * @param cap cap to use in stroke
+     * @param join join to use in stroke
+     */
     public PFixedWidthStroke(final float width, final int cap, final int join) {
         this(width, cap, join, DEFAULT_MITER_LIMIT, null, 0.0f);
     }
 
+    /**
+     * Constructs a PFixedWidthStroke with the stroke properties provided.
+     * 
+     * @deprecated in favor of PFixedWidthStroke(BasicStroke stroke)
+     * 
+     * @param width width of stroke
+     * @param cap cap to use in stroke
+     * @param join join to use in stroke
+     * @param miterlimit miter limit of stroke
+     */
     public PFixedWidthStroke(final float width, final int cap, final int join, final float miterlimit) {
         this(width, cap, join, miterlimit, null, 0.0f);
     }
 
+    /**
+     * Constructs a PFixedWidthStroke with the stroke properties provided.
+     * 
+     * @deprecated in favor of PFixedWidthStroke(BasicStroke stroke)
+     * 
+     * @param width width of stroke
+     * @param cap cap to use in stroke
+     * @param join join to use in stroke
+     * @param miterlimit miter limit of stroke
+     * @param dash array of dash lengths
+     * @param dashPhase phase to use when rendering dashes
+     */
     public PFixedWidthStroke(final float width, final int cap, final int join, final float miterlimit,
             final float[] dash, final float dashPhase) {
         this(new BasicStroke(width, cap, join, miterlimit, dash, dashPhase));