-Warning removal
-minor rewrite for Java 7 resource management
-small speed improvements