Added even more Javadocs