javadoc improved
warnings removed
corrected misleading comments and class name