diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/VehicleRoute.java b/jsprit-core/src/main/java/jsprit/core/problem/solution/route/VehicleRoute.java
index 9ed17e4c..08b17991 100644
--- a/jsprit-core/src/main/java/jsprit/core/problem/solution/route/VehicleRoute.java
+++ b/jsprit-core/src/main/java/jsprit/core/problem/solution/route/VehicleRoute.java
@@ -48,7 +48,7 @@ public class VehicleRoute {
 	}
 
 	public static VehicleRoute emptyRoute() {
-		return new VehicleRoute(TourActivities.emptyTour(), DriverImpl.noDriver(), VehicleImpl.noVehicle());
+		return new VehicleRoute(TourActivities.emptyTour(), DriverImpl.noDriver(), VehicleImpl.createNoVehicle());
 	}
 	
 	public static class Builder {
diff --git a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java b/jsprit-core/src/main/java/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java
index 29358743..e4e9d87b 100644
--- a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java
+++ b/jsprit-core/src/main/java/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java
@@ -1,17 +1,45 @@
+/*******************************************************************************
+ * Copyright (C) 2013  Stefan Schroeder
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either 
+ * version 3.0 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public 
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
 package jsprit.core.problem.vehicle;
 
 import java.util.Collection;
 
-
+/**
+ * Factory that creates a finite fleetmanager.
+ *
+ * @author schroeder
+ */
 public class FiniteFleetManagerFactory implements VehicleFleetManagerFactory{
 
 	private Collection<Vehicle> vehicles;
 	
+	/**
+	 * Constucts the factory.
+	 *
+	 * @param vehicles
+	 */
 	public FiniteFleetManagerFactory(Collection<Vehicle> vehicles) {
 		super();
 		this.vehicles = vehicles;
 	}
 
+	/**
+	 * Creates the finite fleetmanager.
+	 */
 	@Override
 	public VehicleFleetManager createFleetManager() {
 		return new VehicleFleetManagerImpl(vehicles);
diff --git a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/InfiniteFleetManagerFactory.java b/jsprit-core/src/main/java/jsprit/core/problem/vehicle/InfiniteFleetManagerFactory.java
index 458571e0..45189882 100644
--- a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/InfiniteFleetManagerFactory.java
+++ b/jsprit-core/src/main/java/jsprit/core/problem/vehicle/InfiniteFleetManagerFactory.java
@@ -1,17 +1,45 @@
+/*******************************************************************************
+ * Copyright (C) 2013  Stefan Schroeder
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either 
+ * version 3.0 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public 
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
 package jsprit.core.problem.vehicle;
 
 import java.util.Collection;
 
-
+/**
+ * Factory that creates an infinite fleetmanager.
+ *
+ * @author schroeder
+ */
 public class InfiniteFleetManagerFactory implements VehicleFleetManagerFactory{
 
 	private Collection<Vehicle> vehicles;
 	
+	/**
+	 * Constructs the factory.
+	 *
+	 * @param vehicles
+	 */
 	public InfiniteFleetManagerFactory(Collection<Vehicle> vehicles) {
 		super();
 		this.vehicles = vehicles;
 	}
 
+	/**
+	 * Creates the infinite fleetmanager.
+	 */
 	@Override
 	public VehicleFleetManager createFleetManager() {
 		return new InfiniteVehicles(vehicles);
diff --git a/jsprit-core/src/test/java/jsprit/core/problem/solution/route/TestVehicleRoute.java b/jsprit-core/src/test/java/jsprit/core/problem/solution/route/TestVehicleRoute.java
index a21de12f..afa57d79 100644
--- a/jsprit-core/src/test/java/jsprit/core/problem/solution/route/TestVehicleRoute.java
+++ b/jsprit-core/src/test/java/jsprit/core/problem/solution/route/TestVehicleRoute.java
@@ -52,7 +52,7 @@ public class TestVehicleRoute {
 	
 	@Test
 	public void whenBuildingEmptyRouteCorrectly_go(){
-		VehicleRoute route = VehicleRoute.newInstance(TourActivities.emptyTour(),DriverImpl.noDriver(),VehicleImpl.noVehicle());
+		VehicleRoute route = VehicleRoute.newInstance(TourActivities.emptyTour(),DriverImpl.noDriver(),VehicleImpl.createNoVehicle());
 		assertTrue(route!=null);
 	}
 	
@@ -85,7 +85,7 @@ public class TestVehicleRoute {
 		TourActivities tour = new TourActivities();
 		tour.addActivity(ServiceActivity.newInstance(Service.Builder.newInstance("jo", 10).build()));
 		@SuppressWarnings("unused")
-		VehicleRoute route = VehicleRoute.newInstance(tour,DriverImpl.noDriver(),VehicleImpl.noVehicle());
+		VehicleRoute route = VehicleRoute.newInstance(tour,DriverImpl.noDriver(),VehicleImpl.createNoVehicle());
 	}
 	
 	@Test