Misc. javadocs and import cleanup. [0]