CHanged some names, added Javadoc.