Updated sizes and Javadoc