Minor changes. Javadoc updated.