Improve Javadoc and API, start refactoring the Future API