diff --git a/pmd-eclipse/.classpath b/pmd-eclipse/.classpath
index 37ac45104b..ee1f452e9d 100644
--- a/pmd-eclipse/.classpath
+++ b/pmd-eclipse/.classpath
@@ -14,6 +14,6 @@
     <classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.apache.xerces_4.0.3/xmlParserAPIs.jar"/>
     <classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.apache.xerces_4.0.3/xercesImpl.jar"/>
     <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
-    <classpathentry kind="lib" path="C:/eclipse/workspace/pmd-eclipse/lib/pmd-0.8.jar"/>
+    <classpathentry kind="lib" path="C:/eclipse/workspace/pmd-eclipse/lib/pmd-dev.jar"/>
     <classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/pmd-eclipse/plugin.xml b/pmd-eclipse/plugin.xml
index b7556a9016..0188ecc16e 100644
--- a/pmd-eclipse/plugin.xml
+++ b/pmd-eclipse/plugin.xml
@@ -10,7 +10,7 @@
       <library name="pmd-eclipse.jar">
          <export name="*"/>
       </library>
-      <library name="lib/pmd-0.8.jar"/>
+      <library name="lib/pmd-dev.jar"/>
    </runtime>
    <requires>
       <import plugin="org.eclipse.core.resources"/>
@@ -65,6 +65,12 @@
             class="net.sourceforge.pmd.eclipse.preferences.PMDPreferencePage"
             id="net.sourceforge.pmd.eclipse.preferences.PMDPreferencePage">
       </page>
+      <page
+            name="CPD Preferences"
+            category="net.sourceforge.pmd.eclipse.preferences.GeneralPreferencesPage"
+            class="net.sourceforge.pmd.eclipse.preferences.CPDPreferencePage"
+            id="net.sourceforge.pmd.eclipse.CPDPreferencePage">
+      </page>
    </extension>
    <extension
          point="org.eclipse.ui.popupMenus">
@@ -89,6 +95,27 @@
                id="net.sourceforge.pmd.eclipse.PMDCheckFileActionItem">
          </action>
       </objectContribution>
+      <objectContribution
+            objectClass="org.eclipse.core.resources.IProject"
+            nameFilter="*"
+            id="net.sourceforge.pmd.eclipse.CPDCheckProject">
+         <menu
+               label="&amp;CPD"
+               path="cpdadditions"
+               id="net.sourceforge.pmd.eclipse.CPDCheckProjectMenu">
+            <separator
+                  name="group1">
+            </separator>
+         </menu>
+         <action
+               label="Check Project"
+               state="false"
+               class="net.sourceforge.pmd.eclipse.actions.CPDCheckProjectAction"
+               menubarPath="net.sourceforge.pmd.eclipse.CPDCheckProjectMenu/group1"
+               enablesFor="1"
+               id="net.sourceforge.pmd.eclipse.CPDCheckProjectActionItem">
+         </action>
+      </objectContribution>
    </extension>
 
 </plugin>
diff --git a/pmd-eclipse/src/net/sourceforge/pmd/eclipse/PMDVisitor.java b/pmd-eclipse/src/net/sourceforge/pmd/eclipse/PMDVisitor.java
index cb8cb67cb9..7463d65f7b 100644
--- a/pmd-eclipse/src/net/sourceforge/pmd/eclipse/PMDVisitor.java
+++ b/pmd-eclipse/src/net/sourceforge/pmd/eclipse/PMDVisitor.java
@@ -99,8 +99,9 @@ public class PMDVisitor implements IResourceVisitor {
 			(((IFile) resource).getFileExtension() != null) &&
 			((IFile) resource).getFileExtension().equals("java")) {	
 				runPMD( (IFile) resource );
-			return false;
-		} else {
+				return false;
+		} 
+		else {
 			return true;
 		}
 	}
diff --git a/pmd-eclipse/src/net/sourceforge/pmd/eclipse/actions/PMDCheckFileAction.java b/pmd-eclipse/src/net/sourceforge/pmd/eclipse/actions/PMDCheckFileAction.java
index 6f27f3e8d8..0d32a8720e 100644
--- a/pmd-eclipse/src/net/sourceforge/pmd/eclipse/actions/PMDCheckFileAction.java
+++ b/pmd-eclipse/src/net/sourceforge/pmd/eclipse/actions/PMDCheckFileAction.java
@@ -35,9 +35,6 @@ public class PMDCheckFileAction implements IObjectActionDelegate {
 	 */
 	public void run(IAction action) {
 		String[] rulesetFiles = PMDPlugin.getDefault().getRuleSetsPreference();
-		
-		Shell shell = new Shell();
-
 		PMDVisitor visitor = null;
 		try {
 			visitor = new PMDVisitor(rulesetFiles);
@@ -49,13 +46,10 @@ public class PMDCheckFileAction implements IObjectActionDelegate {
 					if (obj instanceof IFile) {
 						((IFile)obj).accept(visitor);
 					} 
-					
 				}
 			}
-
-			//PMDPlugin.getWorkspace().getRoot().accept( visitor );
-			
-		} catch (Exception e) {
+		} 
+		catch (Exception e) {
 			e.printStackTrace();
 		}