Javadocs and minor cleanups and fixups