Fixed #99 and some other javadocs