Bugfixes, more features, better Javadocs.