Corrected some errors in JavaDoc and Imports