diff --git a/run-configurations/teetime-mvn-site.launch b/run-configurations/teetime-mvn-site.launch
index 9d851888e2fb95ea1f4c63eec326212bedf6a130..cdc79de27db69688f37bd7a1e9fb352689142809 100644
--- a/run-configurations/teetime-mvn-site.launch
+++ b/run-configurations/teetime-mvn-site.launch
@@ -3,11 +3,11 @@
 <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
 <stringAttribute key="M2_GOALS" value="site"/>
 <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
-<booleanAttribute key="M2_OFFLINE" value="false"/>
+<booleanAttribute key="M2_OFFLINE" value="true"/>
 <stringAttribute key="M2_PROFILES" value=""/>
 <listAttribute key="M2_PROPERTIES"/>
 <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
-<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+<booleanAttribute key="M2_SKIP_TESTS" value="true"/>
 <intAttribute key="M2_THREADS" value="1"/>
 <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
 <stringAttribute key="M2_USER_SETTINGS" value=""/>
diff --git a/src/main/java/teetime/framework/MonitoringThread.java b/src/main/java/teetime/framework/MonitoringThread.java
index 60f343291dca9be336b353bf62ba3d09580b9ee7..5ca6287907ddd8b26581ff16b5b4e8db26ff4b68 100644
--- a/src/main/java/teetime/framework/MonitoringThread.java
+++ b/src/main/java/teetime/framework/MonitoringThread.java
@@ -1,3 +1,18 @@
+/**
+ * Copyright (C) 2015 TeeTime (http://teetime.sourceforge.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package teetime.framework;
 
 import java.util.ArrayList;
diff --git a/src/main/java/teetime/framework/pipe/IMonitorablePipe.java b/src/main/java/teetime/framework/pipe/IMonitorablePipe.java
index 5857e4bb2cd735366ed5a4bfbf116ca2743723bc..546e64ddca86531179bbda5c5ff964e21302e60d 100644
--- a/src/main/java/teetime/framework/pipe/IMonitorablePipe.java
+++ b/src/main/java/teetime/framework/pipe/IMonitorablePipe.java
@@ -1,3 +1,18 @@
+/**
+ * Copyright (C) 2015 TeeTime (http://teetime.sourceforge.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package teetime.framework.pipe;
 
 public interface IMonitorablePipe {
diff --git a/src/site/markdown/index.markdown b/src/site/markdown/index.markdown
index 33964072765639fed0d020fa362852fe991788f4..eaae70ae49d27b34e8c0b94744c48720f8118784 100644
--- a/src/site/markdown/index.markdown
+++ b/src/site/markdown/index.markdown
@@ -21,21 +21,20 @@ Predefined stages are provided within the source code. You can immediatly start
 
 ## What is it?
 
-TeeTime is a Pipe & Filter Framework for Java.
+TeeTime is a Pipe-and-Filter Framework for Java.
 
 It provides support for the *modeling* and the *execution* of P&F architectures.
+In particular, it features...
 
-It features
-
-- a high reusability and maintainability
+- many primitive and composite ready-to-use stages
 
 - a type-safety way to develop and connect stages
 
-- many pre-defined ready-to-use stages
+- no(!) single-threaded overhead
 
-- no or a minimal synchronization overhead
+- only a minimal multi-threaded overhead
 
-- a hybrid stage execution model
+- threads can be assigned to stages arbitrarily
 
 - and many more...
 
diff --git a/src/site/site.xml b/src/site/site.xml
index 292ac5f09e1204d18478bd24e9387248ba980f98..25d1340c5b72b72385c394707af69c49a6566b2d 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -95,7 +95,7 @@
 			</brand>
 			<slogan>
 				<![CDATA[
-				<span class="slogan">The next-generation Pipe-And-Filter Framework for Java</span>
+				<span class="slogan">The next-generation Pipe-and-Filter Framework for Java</span>
 				]]>
 			</slogan>
 			<titleTemplate>%2$s | %1$s</titleTemplate>