changed the comments in in both files and some bugs