0.8.1 refactorings and javadoc