moar fixing of javadocs and such