Updated to 1.6.1, performed cleanup and javadoc-ing