Fixed javadoc errors, warnings and typos

Due to typos in classes, need to re-import some stuff.