+Javadoc added and reworked some details