finished lab06 and updated javadoc comments