Package import corrections and javadoc @author fixes