More javadocs and attempts to fix the last bug