--- a/tools/checkstyle.xml	Mon Nov 14 18:58:35 2011 +0100
+++ b/tools/checkstyle.xml	Fri Jan 06 22:12:34 2012 +0100
@@ -120,7 +120,7 @@
 	<module name="LocalVariableName"/>
 	<module name="MemberName">
 	    <property  name="format" value="^m[A-Z][a-zA-Z0-9]*$"/>
-	    <property name="severity" value="error"/>
+	    <property name="severity" value="warning"/>
 	</module>
 	<module name="MethodName"/>
 	<module name="PackageName"/>
@@ -145,7 +145,10 @@
 
 	<!-- Checks for imports                              -->
 	<!-- See http://checkstyle.sf.net/config_import.html -->
-	<module name="AvoidStarImport"/>
+	<module name="AvoidStarImport">
+	    <property name="allowStaticMemberImports" value="true"/>
+	    <property name="severity" value="error"/>
+	</module>
 	<module name="IllegalImport"/> <!-- defaults to sun.* packages -->
 	<module name="RedundantImport"/>
 	<module name="UnusedImports">
@@ -154,6 +157,14 @@
 	<module name="AvoidStaticImport">
 	    <property name="excludes" value="*"/>
 	</module>
+	<module name="ImportOrder">
+	    <property name="groups" value="/^javax?\./,/^android\./"/>
+	    <property name="ordered" value="true"/>
+	    <property name="separated" value="true"/>
+	    <property name="option" value="bottom"/>
+	    <property name="caseSensitive" value="true"/>
+	    <property name="severity" value="error"/>
+	</module>
 
 
 	<!-- Checks for Size Violations.                    -->
@@ -166,6 +177,7 @@
 	<module name="AnonInnerLength">
 	    <property name="max" value="60" />
 	</module>
+	<module name="MethodCount"/>
 
 
 	<!-- Checks for whitespace                               -->
@@ -257,7 +269,9 @@
 	<module name="InnerAssignment">
 	    <property name="severity" value="error"/>
 	</module>
-	<module name="MagicNumber"/>
+	<module name="MagicNumber">
+	     <property name="ignoreHashCodeMethod" value="true" />
+	</module>
 	<module name="MissingSwitchDefault">
 	    <property name="severity" value="error"/>
 	</module>
@@ -304,6 +318,7 @@
 	<module name="ReturnCount">
 	    <property name="max" value="3"/>
 	</module>
+	<module name="OneStatementPerLine"/>
 
 	<!-- Checks for class design                         -->
 	<!-- See http://checkstyle.sf.net/config_design.html -->
@@ -320,7 +335,9 @@
 	<module name="ThrowsCount">
 	    <property name="max" value="2" />
 	</module>
-
+	<module name="InnerTypeLast">
+	    <property name="severity" value="error"/>
+	</module>
 
 	<!-- Miscellaneous other checks.                   -->
 	<!-- See http://checkstyle.sf.net/config_misc.html -->
@@ -337,6 +354,9 @@
 	<module name="UpperEll"/>
 
 	<module name="ArrayTypeStyle"/>
+	<module name="OuterTypeFilename">
+	    <property name="severity" value="error"/>
+	</module>
 
     </module>