Working on javadoc :)

Also worked a little bit on the portal :)