Updated javadoc and some space things.