Import correction
javadoc added and fixed