added collated files, updated javadocs