adds javadoc to the files where it was missing, describing intent
fixes some merge stuff... javadoc... stuff