updated javadoc, testing scripts