Javadoc survey and some light cleanup

Swapping a few jars for new ones too.