diff --git a/pom.xml b/pom.xml
index 3bee1fac6ecf85161c4723ba9f3531a47560a6d7..1b4c464cec39c44d40a1fa98de2acc6bd2cf9f69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
 	</ciManagement>
 
 	<dependencies>
-	<!-- only needed if using XCharts as part of a webapp -->
+		<!-- only needed if using XCharts as part of a webapp -->
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
@@ -144,4 +144,9 @@
 		</profile>
 	</profiles>
 
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+	</properties>
+
 </project>
diff --git a/src/main/java/com/xeiam/xchart/Chart.java b/src/main/java/com/xeiam/xchart/Chart.java
index 32b500560c197c44f259c4a6295c022e6258faee..63e22aee8d24663b88aea683982aa2dd36869082 100644
--- a/src/main/java/com/xeiam/xchart/Chart.java
+++ b/src/main/java/com/xeiam/xchart/Chart.java
@@ -126,7 +126,7 @@ public class Chart {
    * @param seriesName
    * @param xData Collection<Number>
    * @param yData Collection<Number>
-   * @return
+   * @return A Series object that you can set properties on
    */
   public Series addSeries(String seriesName, Collection<Number> xData, Collection<Number> yData) {
 
@@ -144,7 +144,7 @@ public class Chart {
    * @param seriesName
    * @param xData double[]
    * @param yData double[]
-   * @return
+   * @return A Series object that you can set properties on
    */
   public Series addSeries(String seriesName, double[] xData, double[] yData) {
 
@@ -158,7 +158,7 @@ public class Chart {
    * @param xData
    * @param yData
    * @param errorBars
-   * @return
+   * @return A Series object that you can set properties on
    */
   public Series addSeries(String seriesName, double[] xData, double[] yData, double[] errorBars) {
 
diff --git a/src/main/java/com/xeiam/xchart/ChartColor.java b/src/main/java/com/xeiam/xchart/ChartColor.java
index 330f0ed71d4e3454cbb788087c2610ee29e63bad..36a967ea513519490ef0a42456fce6638fefd679 100644
--- a/src/main/java/com/xeiam/xchart/ChartColor.java
+++ b/src/main/java/com/xeiam/xchart/ChartColor.java
@@ -45,7 +45,7 @@ public enum ChartColor {
    * Get a AWT Color Object
    * 
    * @param chartColor
-   * @return
+   * @return a AWT Color Object
    */
   public static Color getAWTColor(ChartColor chartColor) {
 
diff --git a/src/main/java/com/xeiam/xchart/SeriesLineStyle.java b/src/main/java/com/xeiam/xchart/SeriesLineStyle.java
index 43e2190c5f1d2f9a1c696f80a71f6d44fab21a1b..6757f5682ade4dd760d6d25096e9561d8a57868b 100644
--- a/src/main/java/com/xeiam/xchart/SeriesLineStyle.java
+++ b/src/main/java/com/xeiam/xchart/SeriesLineStyle.java
@@ -81,7 +81,7 @@ public enum SeriesLineStyle {
    * Get an AWT Stroke
    * 
    * @param seriesMarker
-   * @return
+   * @return an AWT Stroke
    */
   protected static BasicStroke getBasicStroke(SeriesLineStyle seriesMarker) {
 
@@ -89,9 +89,9 @@ public enum SeriesLineStyle {
   }
 
   /**
-   * Gets the next Stroke
+   * Gets the next BasicStroke
    * 
-   * @return
+   * @return the next BasicStroke
    */
   protected static BasicStroke getNextBasicStroke() {
 
diff --git a/src/main/java/com/xeiam/xchart/XChartPanel.java b/src/main/java/com/xeiam/xchart/XChartPanel.java
index c4842a5741ab8c05ac8bfda3e501a669eaf4bf7e..76688bd85014d09528258bcbbfbe21a50f01cd2f 100644
--- a/src/main/java/com/xeiam/xchart/XChartPanel.java
+++ b/src/main/java/com/xeiam/xchart/XChartPanel.java
@@ -25,7 +25,6 @@ import javax.swing.JPanel;
  * A Swing JPanel that contains a Chart
  * 
  * @author timmolter
- * @create Sep 9, 2012
  */
 public class XChartPanel extends JPanel {