Added javadoc comments to modified files.
fixed merge conflicts, and merged in arne's changes