Updated files to correspond to fixed lab04 files (fixed javadoc comments)