Warnings solved
Javadoc added