Improved Javadocs
added logs